[geany/geany] efb639: Scintilla update script: only ask for checking when something changed

Colomban Wendling git-noreply at xxxxx
Tue Apr 21 13:40:15 UTC 2015


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Tue, 21 Apr 2015 13:40:15 UTC
Commit:      efb639435c8ad0790951d7bde261463e57376905
             https://github.com/geany/geany/commit/efb639435c8ad0790951d7bde261463e57376905

Log Message:
-----------
Scintilla update script: only ask for checking when something changed

Only ask the user to check the SciLexer.h diff if the file actually
changed.


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

Modified: scripts/update-scintilla.sh
18 lines changed, 11 insertions(+), 7 deletions(-)
===================================================================
@@ -74,16 +74,20 @@ Don't forget to add new files to the build system.
 EOF
 fi
 
-# summary
-cat << EOF
-
-Please check the diff and upgrade the style mappings in
-src/highlightingmappings.h.
+# check for possible changes to styles
+if ! git diff --quiet scintilla/include/SciLexer.h; then
+	cat << EOF
 
 Check the diff of scintilla/include/SciLexer.h to see whether and which
-mapping to add or update (use git diff scintilla/include/SciLexer.h).
+mapping to add or update in src/highlightingmappings.h
+(use git diff scintilla/include/SciLexer.h).
 Don't forget to also update the comment and string styles in
 src/highlighting.c.
+EOF
+fi
+
+# summary
+cat << EOF
 
-Finally, add or update the appropriate line in NEWS.
+Don't forget to add or update the appropriate line in NEWS.
 EOF



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


More information about the Commits mailing list