Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: GitHub noreply@github.com Date: Fri, 11 Oct 2024 18:24:59 UTC Commit: ddb627889997df7b5a5a44ce581f7973824478cc https://github.com/geany/geany/commit/ddb627889997df7b5a5a44ce581f7973824478...

Log Message: ----------- Merge pull request #3982 from b4n/scintilla-update-script-fix

Fix Scintilla update script

Modified Paths: -------------- scintilla/scintilla_changes.patch scripts/update-scintilla.sh

Modified: scintilla/scintilla_changes.patch 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,7 @@ diff --git scintilla/lexilla/src/Lexilla.cxx scintilla/lexilla/src/Lexilla.cxx index cd4b23617..af4a73db4 100644 --- scintilla/lexilla/src/Lexilla.cxx +++ scintilla/lexilla/src/Lexilla.cxx -@@ -167,8 +167,68 @@ +@@ -167,8 +167,72 @@

CatalogueModules catalogueLexilla;

Modified: scripts/update-scintilla.sh 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -44,7 +44,7 @@ copy_to() dest="$1" shift

- if ! [ -d "$dest" ]; then + if ! [ -e "$dest" ]; then echo "$dest does not exist." >&2; exit 1 fi @@ -74,7 +74,7 @@ copy_to scintilla/lexilla/lexlib "$LEX_SRC"/lexlib/*.h copy_to scintilla/lexilla/ "$LEX_SRC"/License.txt copy_to scintilla/lexilla/ "$LEX_SRC"/version.txt # now copy the lexers we use -git -C scintilla/lexilla/lexers/ ls-files *.cxx | while read f; do +git -C scintilla/lexilla/lexers/ ls-files '*.cxx' | while read f; do copy_to "scintilla/lexilla/lexers" "$LEX_SRC/lexers/$f" done

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).