Fix/agent

bash/.klibio/dev.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# activate bash checks
+#set -o xtrace   # activate debug
+set -o nounset  # exit with error on unset variables
+set -o errexit  # exit if any statement returns a non-true return value
+set -o pipefail # exit if any pipe command is failing
+
+echo "# DEVELOPMENT start"
+
+unset ospath
+
+removeFromPath () {
+    local segment=$1
+    if [[ $ospath == *"\\"* ]]; then
+        # windows remove segment path (and optional trailing semi-colon)
+        export PATH=$(echo ${PATH} | sed -E -e "s/${segment/\\/\\\\};?//" -e "s/;$//")
+    else
+        # *nix remove segment from path (and optional trailing colon)
+        export PATH=$(echo ${PATH} | sed -E -e "s;${segment}:?;;" -e "s;:$;;")
+    fi
+    export $PATH
+}
+
+PATH=$PATH:"/c/dir_a:/c/dir_b:/c/dir_c:/c/dir_d"
+echo "PATH=${PATH}"
+
+path2remove="/c/dir_a"
+echo "path after removing ${path2remove} from path $( removeFromPath ${path2remove} )"
+
+path2remove="/c/dir_b"
+echo "path after removing ${path2remove} from path $( removeFromPath ${path2remove} )"
+
+path2remove="/c/dir_d"
+echo "path after removing ${path2remove} from path $( removeFromPath ${path2remove} )"
+
+
+ospath="c:\dir_a;c:\dir_b;c:\dir_c;c:\dir_d"
+echo "ospath=${ospath}"
+
+path2remove="c:\dir_a"
+echo "path after removing ${path2remove} from path $( removeFromPath ${path2remove} )"
+
+path2remove="c:\dir_b"
+echo "path after removing ${path2remove} from path $( removeFromPath ${path2remove} )"
+
+path2remove="c:\dir_d"
+echo "path after removing ${path2remove} from path $( removeFromPath ${path2remove} )"
+
+echo "# DEVELOPMENT finish"
+

bash/.klibio/klibio.bash

@@ -21,7 +21,7 @@ declare -a build_agent_vars=(
   "date"
   "branch" "vcs_ref" "vcs_ref_short" # git variables
 )
-if [[ ! -n ${AGENT_ID:-} ]]; then
+if [[ ! -z ${AGENT_ID+x} ]]; then
   echo "running inside workflow pipeline - hence set variables"
   for i in "${build_agent_vars[@]}"; do
     key=$(echo $i | tr '[:lower:]' '[:upper:]')

bash/.klibio/set-java.sh

@@ -9,7 +9,9 @@ set -o pipefail # exit if any pipe command is failing
 java_home_suffix=${java_home_suffix:=}
 
 removeFromPath () {
-    export PATH=$(echo $PATH | sed -E -e "s;:$1;;" -e "s;$1:?;;")
+    local segment=$1
+    # *nix remove segment from path (and optional trailing colon)
+    export PATH=$(echo ${PATH} | sed -E -e "s;${segment}:?;;" -e "s;:$;;")
 }
 
 if [ -n "${JAVA_HOME+x}" ]; then  
@@ -18,17 +20,21 @@ fi
 
 case $1 in
     unset)
+        removeFromPath $JAVA_HOME
         unset JAVA_HOME
         echo "JAVA_HOME unset - available Java LTS are 8, 11, 17"
         exit 0
     ;;
     8)
+        removeFromPath $JAVA_HOME
         export JAVA_HOME=${KLIBIO}/java/ee/JAVA8${java_home_suffix}
     ;;
     11)
+        removeFromPath $JAVA_HOME
         export JAVA_HOME=${KLIBIO}/java/ee/JAVA11${java_home_suffix}
     ;;
     17)
+        removeFromPath $JAVA_HOME
         export JAVA_HOME=${KLIBIO}/java/ee/JAVA17${java_home_suffix}
     ;;
     *)
@@ -41,3 +47,8 @@ echo JAVA_HOME=${JAVA_HOME}
 export PATH=${JAVA_HOME}/bin:$PATH
 
 java -version
+
+// reset the bash settings
+set +o nounset  # exit with error on unset variables
+set +o errexit  # exit if any statement returns a non-true return value
+set +o pipefail # exit if any pipe command is failing