Merge branch 'unstable' into trackhat

* unstable:
  cmake: don't upload tarball for branch builds
  cmake: append branch information for branch builds

1 files changed, 17 insertions, 11 deletions

diff --git a/make-tar.sh b/make-tar.sh
index 08114127..abb83fdd 100644
--- a/make-tar.sh
+++ b/make-tar.sh
@@ -4,22 +4,28 @@ prefix="$1"
 filename="$2"
 bin="$3"
 
+branch="$(git rev-parse --abbrev-ref HEAD)"
+
 cmake --build "$bin" --target install -- -j4 || exit 1
 
-if  : &&
+if : &&
     cd $(dirname -- "${prefix}") &&
     zip -9r "${filename}" $(basename "${prefix}")
 then
-    case "$USER,$(uname -s)" in
-        # for the script see https://github.com/andreafabrizi/Dropbox-Uploader
-        sthalik,CYGWIN_*)
-            dropbox_uploader.sh -p upload "$filename" /
-            bn="$(basename -- "$filename")"
-            l="$(dropbox_uploader.sh -q share /"$bn")"
-            test -n "$l" && echo -n "$l" | putclip
-            echo $l
-            echo -ne '\a' ;;
-        *) ls -lh -- "${filename}" ;;
+    case "$branch" in
+    unstable)
+        case "$USER,$(uname -s)" in
+            # for the script see https://github.com/andreafabrizi/Dropbox-Uploader
+            sthalik,CYGWIN_*)
+                dropbox_uploader.sh -p upload "$filename" /
+                bn="$(basename -- "$filename")"
+                l="$(dropbox_uploader.sh -q share /"$bn")"
+                test -n "$l" && echo -n "$l" | putclip
+                echo $l
+                echo -ne '\a' ;;
+            *) ls -lh -- "${filename}" ;;
+        esac ;;
+    *) ;;
     esac
 else
     rm -fv -- "${filename}"