Merge pull request #21 from JuliaParallel/initial

Fix usage of newly introduced JULIAUP_EXE

Author: omlins

juhpc

@@ -179,8 +179,7 @@ info_end "$INFO_MSG"
 
 # Create a wrapper for juliaup that installs juliaup (and latest julia) on scratch if it is not already installed
 
-INFO_MSG="Creating wrapper for juliaup"
-info_start "$INFO_MSG"
+info_start "Creating wrapper for juliaup"
 
 export JULIAUP_WRAPPER_BINDIR="$JUHPC_SETUP_INSTALLDIR/juliaup_wrapper"
 export JULIAUP_WRAPPER="$JULIAUP_WRAPPER_BINDIR/juliaup"
@@ -198,32 +197,31 @@ info() {
     echo -e "$(ENV["JUHPC"]) \$message" >&2
 }
 
-export JULIAUP_EXE="$(ENV["JULIAUP_BINDIR"])/juliaup"
+JULIAUP_EXE="$(ENV["JULIAUP_BINDIR"])/juliaup"
 
-if [ ! -f "$JULIAUP_EXE" ]; then
+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"
-    if [ ! -f "$JULIAUP_EXE" ]; then error "juliaup installation failed."; fi
+    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
-    "$JULIAUP_EXE" \$@
+    "\$JULIAUP_EXE" \$@
 fi
 """)
 ' > "$JULIAUP_WRAPPER"
 chmod +x "$JULIAUP_WRAPPER"
 
-info_end "$INFO_MSG"
+info "... done."
 
 
 # Create an activation script that sets environment variables for juliaup, julia and HPC key packages
 
-INFO_MSG="Creating activation script"
-info_start "$INFO_MSG"
+info_start "Creating activation script"
 
 export JULIAUP_DEPOT="$JULIAUP_INSTALLDIR/depot"
 export JULIA_DEPOT="$JULIAUP_INSTALLDIR/depot"
@@ -259,7 +257,7 @@ $(haskey(ENV,"JUHPC_ADIOS2_HOME") && ENV["JUHPC_ADIOS2_HOME"] != "" ? """
     """ : "")
 """)' > "$ACTIVATE_SCRIPT"
 
-info_end "$INFO_MSG"
+info "... done."
 
 
 # Optionally execute a site-specific post installation julia script (if passed a third argument)