Merge pull request #2438 from ericfont/101361-upload-even-if-list-of-…

…branches-empty upload even if list of branches is empty
musescore · Mar 12, 2016 · 446e80d · 446e80d
2 parents a9a1368 + 60d1c6f
commit 446e80d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/build/travis/job2_AppImage/build.sh b/build/travis/job2_AppImage/build.sh
@@ -46,14 +46,14 @@ case "$1" in
 esac
 
 # Should the AppImage be uploaded?
-if [ "$1" == "--upload-branches" ]; then
-  # User passed in list of branchs so only upload those listed
+if [ "$1" == "--upload-branches" ] && [ "$2" != "ALL" ]; then
+  # User passed in a list of zero or more branches so only upload those listed
   shift
   for upload_branch in "$@" ; do
     [ "$branch" == "$upload_branch" ] && upload=true || true # bypass `set -e`
   done
 else
-  # No list passed in so upload on every branch
+  # No list passed in (or specified "ALL"), so upload on every branch
   upload=true
 fi