Changeset 26348

Timestamp:

07/14/21 00:09:34 (4 years ago)

Author:

jdquinn

Message:

BUG: It appears that 'git pull' is no longer working on existing installation

File:

• issm/trunk-jpl/externalpackages/emscripten/install.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/emscripten/install.sh

@@ -15 +15 @@
 ## Environment
 #
-PREFIX="${ISSM_DIR}/externalpackages/emscripten/install"
+PREFIX="${ISSM_EXT_DIR}/emscripten/install"
 
-# Get Emscripten SDK (emsdk) driver if we have not previously installed
-# Emscripten. Otherwise, just get the latest version.
-if [[ ! -d ${PREFIX} ]]; then
-        # Get the emsdk repo
-        git clone https://github.com/emscripten-core/emsdk.git
+# Cleanup
+rm -rf ${PREFIX}
 
-        # Create $PREFIX directory
-        mkdir -p ${PREFIX}
+# Get the emsdk repo
+git clone https://github.com/emscripten-core/emsdk.git
 
-        # Move source to $PREFIX directory
-        mv emsdk/* ${PREFIX}
-        rm -rf emsdk
+# Create $PREFIX directory
+mkdir -p ${PREFIX}
 
-        cd ${PREFIX}
-else
-        # Fetch the latest version of the emsdk
-        cd ${PREFIX}
-        git pull
-fi
+# Move source to $PREFIX directory
+mv emsdk/* ${PREFIX}
+rm -rf emsdk
+
+cd ${PREFIX}
 
 # Download and install the latest SDK tools.