Update to use new run-matlab-command (#39)

* update to use RMC binary

* added workdir to run-tests

* fixing shellcheck findings in install

* took out accidental activation flag def in install

* taking out extra quotes in run-tests

* fixing typo for windows paths

* fixing casing and trying run-tests without heredoc

* remove unused var

* adding rootdir conversion back to install.sh

* Update src/scripts/install.sh

Co-authored-by: Mark Cafaro <34887852+mcafaro@users.noreply.github.com>

* adding quotes around args to be safe

* Update src/scripts/install.sh

Co-authored-by: Mark Cafaro <34887852+mcafaro@users.noreply.github.com>

Co-authored-by: Mark Cafaro <34887852+mcafaro@users.noreply.github.com>

Author: davidbuzinski

src/scripts/install.sh

@@ -18,16 +18,28 @@ fi
 
 # install core system dependencies
 if [[ $os = Linux ]]; then
-    downloadAndRun https://ssd.mathworks.com/supportfiles/ci/matlab-deps/v0/install.sh ${PARAM_RELEASE}
+    downloadAndRun https://ssd.mathworks.com/supportfiles/ci/matlab-deps/v0/install.sh "${PARAM_RELEASE}"
 fi
 
 # install ephemeral version of MATLAB
-downloadAndRun https://ssd.mathworks.com/supportfiles/ci/ephemeral-matlab/v0/ci-install.sh --release ${PARAM_RELEASE}
+if [ -n "${MATHWORKS_ACCOUNT}" ] &&  [ -n "${MATHWORKS_TOKEN}" ]; then
+    activationFlag="--skip-activation"
+fi
+
+downloadAndRun https://ssd.mathworks.com/supportfiles/ci/ephemeral-matlab/v0/ci-install.sh --release "${PARAM_RELEASE}" $activationFlag
 
-# add MATLAB to path
 tmpdir=$(dirname "$(mktemp -u)")
 rootdir=$(cat "$tmpdir/ephemeral_matlab_root")
+
+# install matlab-batch
 if [[ $os = CYGWIN* || $os = MINGW* || $os = MSYS* ]]; then
+    batchInstallDir='/c/Program Files/matlab-batch'
     rootdir=$(cygpath "$rootdir")
+else
+    batchInstallDir='/opt/matlab-batch'
 fi
-echo 'export PATH="'$rootdir'/bin:$PATH"' >> $BASH_ENV
+
+downloadAndRun https://ssd.mathworks.com/supportfiles/ci/matlab-batch/v0/install.sh "$batchInstallDir"
+
+# add MATLAB and matlab-batch to path
+echo 'export PATH="'$rootdir'/bin:'$batchInstallDir':$PATH"' >> $BASH_ENV

src/scripts/run-command.sh

@@ -1,16 +1,27 @@
+downloadAndRun() {
+    url=$1
+    shift
+    if [[ -x $(command -v sudo) ]]; then
+    curl -sfL $url | sudo -E bash -s -- "$@"
+    else
+    curl -sfL $url | bash -s -- "$@"
+    fi
+}
+
 tmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'run-command')
 
-# download run command shell scripts
-curl -sfLo "${tmpdir}/run-matlab-command.zip" https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v0/run-matlab-command.zip
-unzip -qod "${tmpdir}/bin" "${tmpdir}/run-matlab-command.zip"
+# install run-matlab-command
+downloadAndRun https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v1/install.sh "${tmpdir}/bin"
 
 # form OS appropriate paths for MATLAB
 os=$(uname)
 workdir=$(pwd)
 scriptdir=$tmpdir
+binext=""
 if [[ $os = CYGWIN* || $os = MINGW* || $os = MSYS* ]]; then
     workdir=$(cygpath -w "$workdir")
     scriptdir=$(cygpath -w "$scriptdir")
+    binext=".exe"
 fi
 
 # create script to execute
@@ -22,4 +33,4 @@ ${PARAM_COMMAND}
 EOF
 
 # run MATLAB command
-"${tmpdir}/bin/run_matlab_command.sh" "cd('${scriptdir//\'/\'\'}'); $script"
+"${tmpdir}/bin/run-matlab-command$binext" "cd('${scriptdir//\'/\'\'}');$script"

src/scripts/run-tests.sh

@@ -1,8 +1,17 @@
+downloadAndRun() {
+    url=$1
+    shift
+    if [[ -x $(command -v sudo) ]]; then
+    curl -sfL $url | sudo -E bash -s -- "$@"
+    else
+    curl -sfL $url | bash -s -- "$@"
+    fi
+}
+
 tmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'run-tests')
 
-# download run command shell scripts
-curl -sfLo "${tmpdir}/bin.zip" https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v0/run-matlab-command.zip
-unzip -qod "${tmpdir}/bin" "${tmpdir}/bin.zip"
+# install run-matlab-command
+downloadAndRun https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v1/install.sh "${tmpdir}/bin"
 
 # download script generator
 curl -sfLo "${tmpdir}/scriptgen.zip" https://ssd.mathworks.com/supportfiles/ci/matlab-script-generator/v0/matlab-script-generator.zip
@@ -11,12 +20,13 @@ unzip -qod "${tmpdir}/scriptgen" "${tmpdir}/scriptgen.zip"
 # form OS appropriate paths for MATLAB
 os=$(uname)
 gendir=$tmpdir
+binext=""
 if [[ $os = CYGWIN* || $os = MINGW* || $os = MSYS* ]]; then
     gendir=$(cygpath -w "$gendir")
+    binext=".exe"
 fi
 
-# generate and run MATLAB test script
-"${tmpdir}/bin/run_matlab_command.sh" "\
+"${tmpdir}/bin/run-matlab-command$binext" "\
     addpath('${gendir}/scriptgen');\
     testScript = genscript('Test',\
     'JUnitTestResults','${PARAM_TEST_RESULTS_JUNIT}',\