yet another attempt at a trivial thing.

[simgrid.git] / tools / jenkins / build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 3052b0e..b19a055 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -75,7 +75,7 @@ elif [ -f /etc/redhat-release ]; then
     os=""
     ver=$(cat /etc/redhat-release)
 elif [ -f /usr/bin/sw_vers ]; then
-    os=$(sw_vers -producls /e   tName)
+    os=$(sw_vers -productName)
     ver=$(sw_vers -productVersion)
 elif [ -f /bin/freebsd-version ]; then
     os=$(uname -s)
@@ -125,6 +125,13 @@ case "$build_mode" in
   ;;
 esac
 
+if [ "$2" = "" ]; then
+  branch_name="unknown"
+else
+  branch_name="$2"
+fi
+echo "Branch built is $branch_name"
+
 NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
 GENERATOR="Unix Makefiles"
 
@@ -210,7 +217,7 @@ if [ -f Testing/TAG ] ; then
    mv CTestResults.xml $WORKSPACE
 fi
 
-if test -n "$INSTALL"; then
+if test -n "$INSTALL" && [ ${branch_name} = "master" ] ; then
   echo "XX"
   echo "XX Test done. Install everything since it's a regular build, not on a Windows."
   echo "XX"