diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2022-02-26 20:48:07 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2022-02-26 21:07:03 +0000 |
| commit | 9525d75533b4cfb1e652b4ee7dd30ca5e0b25aab (patch) | |
| tree | 6e3b7b06b59c221966ba0ec66ad9c0fe60c30544 /Tools | |
| parent | 961424a986a67bd8d9c4cf259c8ad70563f01192 (diff) | |
| download | swig-9525d75533b4cfb1e652b4ee7dd30ca5e0b25aab.tar.gz | |
GHA: Tidy up scilab install
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/CI-linux-environment.sh | 6 | ||||
| -rw-r--r-- | Tools/CI-linux-install.sh | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Tools/CI-linux-environment.sh b/Tools/CI-linux-environment.sh index 0e9526dcf..e854c5b0e 100644 --- a/Tools/CI-linux-environment.sh +++ b/Tools/CI-linux-environment.sh @@ -29,11 +29,5 @@ case "$SWIGLANG" in set -x fi ;; - "scilab") - # Travis has the wrong version of Java pre-installed resulting in error using scilab: - # /usr/bin/scilab-bin: error while loading shared libraries: libjava.so: cannot open shared object file: No such file or directory - echo "JAVA_HOME was set to $JAVA_HOME" - unset JAVA_HOME - ;; *) ;; esac diff --git a/Tools/CI-linux-install.sh b/Tools/CI-linux-install.sh index ff194c719..4dad7ba29 100644 --- a/Tools/CI-linux-install.sh +++ b/Tools/CI-linux-install.sh @@ -138,7 +138,7 @@ case "$SWIGLANG" in ;; "scilab") if [[ -z "$VER" ]]; then - $RETRY sudo apt-get -qq install scilab scilab-include + $RETRY sudo apt-get -qq install scilab else $RETRY wget --progress=dot:giga "https://www.scilab.org/download/$VER/scilab-$VER.bin.linux-x86_64.tar.gz" # $HOME/.local/bin is in PATH and writeable |