[HL] Update wrapper script for linux \& mac

gama-platform · Sep 10, 2021 · 67740f8 · 67740f8
1 parent f9f09e1
commit 67740f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/travis/jdk/linux/gama-headless.sh b/travis/jdk/linux/gama-headless.sh
@@ -16,16 +16,16 @@ done
 
 workspaceCreate=0
 case "$@" in 
-  *-help*|*-version*|*-validate*|*-failed*|*-xml*)
+  *-help*|*-version*|*-validate*|*-failed*|*-xml*|*-batch*)
     workspaceCreate=1
     ;;
 esac
 
 
 echo "******************************************************************"
-echo "* GAMA version 1.8.1                                             *"
+echo "* GAMA version 1.8.2                                             *"
 echo "* http://gama-platform.org                                       *"
-echo "* (c) 2007-2020 UMI 209 UMMISCO IRD/SU & Partners                *"
+echo "* (c) 2007-2021 UMI 209 UMMISCO IRD/SU & Partners                *"
 echo "******************************************************************"
 passWork=.workspace
 # w/ output folder

diff --git a/travis/jdk/mac/gama-headless.sh b/travis/jdk/mac/gama-headless.sh
@@ -16,16 +16,16 @@ done
 
 workspaceCreate=0
 case "$@" in 
-  *-help*|*-version*|*-validate*|*-failed*|*-xml*)
+  *-help*|*-version*|*-validate*|*-failed*|*-xml*|*-batch*)
     workspaceCreate=1
     ;;
 esac
 
 
 echo "******************************************************************"
-echo "* GAMA version 1.8.1                                             *"
+echo "* GAMA version 1.8.2                                             *"
 echo "* http://gama-platform.org                                       *"
-echo "* (c) 2007-2020 UMI 209 UMMISCO IRD/SU & Partners                *"
+echo "* (c) 2007-2021 UMI 209 UMMISCO IRD/SU & Partners                *"
 echo "******************************************************************"
 passWork=.workspace
 # w/ output folder
@@ -35,14 +35,13 @@ if [ $workspaceCreate -eq 0 ]; then
       mkdir ${@: -1}
   fi
   # create workspace in output folder
-  # `expr` use is to remove whitespace from MacOS's result
-  passWork=${@: -1}/.workspace$(find ${@: -1} -name ".workspace*" | expr $(wc -l))
+  passWork=${@: -1}/.workspace$(find ${@: -1} -name ".workspace*" | wc -l)
   mkdir -p $passWork
 
 # w/o output folder
 else
   # create workspace in current folder
-  passWork=${@: -1}/.workspace$(find ${@: -1} -name ".workspace*" | expr $(wc -l))
+  passWork=.workspace$(find ./ -maxdepth 1 -name ".workspace*" | wc -l)
 fi
 
 if ! "$( dirname "${BASH_SOURCE[0]}" )"/../jdk/Contents/Home/bin/java -cp "$( dirname "${BASH_SOURCE[0]}" )"/../Eclipse/plugins/org.eclipse.equinox.launcher*.jar -Xms512m -Xmx$memory -Djava.awt.headless=true org.eclipse.core.launcher.Main -application msi.gama.headless.id4 -data $passWork "$@"; then