Improve TMP selection, success check and output

Author: omlins

juhpc

@@ -31,6 +31,16 @@ info() {
     echo -e "$JUHPC $message" >&2
 }
 
+info_start() {
+    local message="$1"
+    info "$message..."
+}
+
+info_end() {
+    local message="$1"
+    info "... done. $message completed."
+}
+
 cleanup() {
     info "cleaning up temporary juliaup installation in $TMP_JULIAUP_ROOTDIR."
     rm -rf "$TMP_JULIAUP_ROOTDIR"
@@ -70,7 +80,15 @@ export JUHPC_POST_INSTALL_JL="$3"
 # Set (derived) general environment variables
 
 export JULIAUP_BINDIR=$JULIAUP_INSTALLDIR/bin # juliaup and julia binaries
-export TMP=/dev/shm/$USER
+
+if [ -d "/dev/shm" ]; then
+    export TMP="/dev/shm/$USER"
+elif [ -d "/tmp" ]; then
+    export TMP="/tmp/$USER"
+else
+    error "Neither /dev/shm nor /tmp directories exist. Cannot set TMP environment variable."
+fi
+
 export TMP_JULIAUP_ROOTDIR=$TMP/juliaup
 
 
@@ -84,7 +102,8 @@ check_dir "$JUHPC_SETUP_INSTALLDIR"
 
 # Download and install julia in /tmp using juliaup
 
-info "Installing temporary juliaup installation in $TMP_JULIAUP_ROOTDIR..."
+INFO_MSG="Installing temporary juliaup installation in $TMP_JULIAUP_ROOTDIR"
+info_start $INFO_MSG
 
 export TMP_JULIAUP_BINDIR=$TMP_JULIAUP_ROOTDIR/bin # juliaup and julia binaries
 export JULIAUP_DEPOT_PATH=$TMP_JULIAUP_ROOTDIR/depot
@@ -98,12 +117,13 @@ curl -fsSL https://install.julialang.org | sh -s -- --add-to-path=no --yes --pat
 
 if [ ! -f "$TMP_JULIAUP_BINDIR/juliaup" ]; then error "temporary juliaup installation failed."; fi
 
-info "... done."
+info_end $INFO_MSG 
 
 
 # Create preferences for HPC key packages that require system libraries (MPI.jl, CUDA.jl, AMDGPU.jl, HDF5.jl, ADIOS2.jl, ...)
 
-info "Creating preferences for HPC key packages..."
+INFO_MSG="Creating preferences for HPC key packages"
+info_start $INFO_MSG
 
 export JULIA_PREFDIR=$JUHPC_SETUP_INSTALLDIR/julia_preferences
 export JULIA_PREF_PROJECT=$JULIA_PREFDIR/Project.toml
@@ -154,12 +174,13 @@ if [ -n "${JUHPC_HDF5_HOME}" ]; then
     julia --project=$JULIA_PREFDIR -e 'using HDF5; HDF5.API.set_libraries!("$(ENV["JUHPC_HDF5_HOME"])/lib/libhdf5.so", "$(ENV["JUHPC_HDF5_HOME"])/lib/libhdf5_hl.so")'
 fi
 
-info "... done."
+info_end $INFO_MSG
 
 
 # Create a wrapper for juliaup that installs juliaup (and latest julia) on scratch if it is not already installed
 
-info "Creating wrapper for juliaup..."
+INFO_MSG="Creating wrapper for juliaup"
+info_start $INFO_MSG
 
 export JULIAUP_WRAPPER_BINDIR=$JUHPC_SETUP_INSTALLDIR/juliaup_wrapper
 export JULIAUP_WRAPPER=$JULIAUP_WRAPPER_BINDIR/juliaup
@@ -177,27 +198,32 @@ info() {
     echo -e "$(ENV["JUHPC"]) \$message" >&2
 }
 
-if [ ! -f $(ENV["JULIAUP_BINDIR"])/juliaup ]; then
+JULIAUP_EXE=$(ENV["JULIAUP_BINDIR"])/juliaup
+
+if [ ! -f "$JULIAUP_EXE" ]; then
     print_logo
     info "This is the first call to juliaup; juliaup and the latest julia will now be installed. After that, you can use juliaup and julia normally. Installing in $(ENV["JULIAUP_INSTALLDIR"])..."
+    sleep 3
     PATH_OLD=\$PATH
     export PATH=\$(echo \$PATH | perl -pe "s|[^:]*juliaup(?:_wrapper)?[^:]*:?||g") # Remove all juliaup paths from PATH
     curl -fsSL https://install.julialang.org | sh -s -- --add-to-path=no --yes --path=$(ENV["JULIAUP_INSTALLDIR"]) --background-selfupdate 0 --startup-selfupdate 0 || { echo "Failed to install Juliaup (and Julia)." >&2; exit 1; }
     export PATH=\$PATH_OLD
-    info "... done."
+    if [ ! -f "$JULIAUP_EXE" ]; then error "juliaup installation failed."; fi
+    info "... done. Installation of juliaup and the latest julia in $(ENV["JULIAUP_INSTALLDIR"]) completed. You can use juliaup and julia normally."
 else
-    $(ENV["JULIAUP_BINDIR"])/juliaup \$@
+    $JULIAUP_EXE \$@
 fi
 """)
 ' > $JULIAUP_WRAPPER
 chmod +x $JULIAUP_WRAPPER
 
-info "... done."
+info_end $INFO_MSG
 
 
 # Create an activation script that sets environment variables for juliaup, julia and HPC key packages
 
-info "Creating activation script..."
+INFO_MSG="Creating activation script"
+info_start $INFO_MSG
 
 export JULIAUP_DEPOT=$JULIAUP_INSTALLDIR/depot
 export JULIA_DEPOT=$JULIAUP_INSTALLDIR/depot
@@ -233,15 +259,16 @@ $(haskey(ENV,"JUHPC_ADIOS2_HOME") && ENV["JUHPC_ADIOS2_HOME"] != "" ? """
     """ : "")
 """)' > $ACTIVATE_SCRIPT
 
-info "... done."
+info_end $INFO_MSG
 
 
 # Optionally execute a site-specific post installation julia script (if passed a third argument)
 
 if [ -n "${JUHPC_POST_INSTALL_JL}" ]; then
-    info "Executing site-specific post installation julia script (using the project where preferences were set)..."
+    INFO_MSG="Executing site-specific post installation julia script (using the project where preferences were set)"
+    info_start $INFO_MSG
     julia --project=$JULIA_PREFDIR $JUHPC_POST_INSTALL_JL
-    info "... done."
+    info_end $INFO_MSG
 fi
 
 
@@ -250,4 +277,4 @@ fi
 cleanup
 rm -f $JULIA_PREFDIR/Manifest.toml
 
-info "... Installation of HPC setup for juliaup, julia and HPC key packages requiring system libraries is complete."
+info "... Installation of HPC setup for juliaup, julia and HPC key packages requiring system libraries is complete.\n\n"