Commits

Rob Williams  committed 03d4d6e

Integrate with latest BriteOnyx framework

  • Participants
  • Parent commits 992d46e

Comments (0)

Files changed (4)

File bin/Linux/helper/declare-BASH.bash

   declare -i _Status="${2:-1}"
   _logFatal "Aborting with status ${_Status}:  ${_Message}"
   if [[ "$SHLVL" -eq 1 ]] ; then
-    logError 'At top level of BASH shell, NOT aborting!'
+    logError 'At top level of BASH shell, NOT exiting!'
     # dumpBash
   fi
   return ${_Status}

File bin/Python/helper/configure_TMPDIR

 #!/bin/bash
-logInfo "$BASH_SOURCE" "$LINENO" 'Configuring temporary directory $TMPDIR...'
+logInfo 'Configuring temporary directory $TMPDIR...'
 
-requireVariable "$BASH_SOURCE" "$LINENO" TMPDIR || return 1
-createDirectory $TMPDIR                         || return 1
+requireVariable TMPDIR  || return 1
+createDirectory $TMPDIR || return 1
 
 # Return, but do NOT exit, with a success code
 return 0

File bin/Python/helper/configure_pip

 #!/bin/bash
-logInfo "$BASH_SOURCE" "$LINENO" 'Configuring PIP...'
+logInfo 'Configuring PIP...'
 
 export PIP_REQUIRE_VIRTUALENV=true
 export PIP_RESPECT_VIRTUALENV=true
 
-requireVariable "$BASH_SOURCE" "$LINENO" PIP_DOWNLOAD_CACHE || return 1
-createDirectory $PIP_DOWNLOAD_CACHE                         || return 1
+requireVariable PIP_DOWNLOAD_CACHE  || return 1
+createDirectory $PIP_DOWNLOAD_CACHE || return 1
 
 # Return, but do NOT exit, with a success code
 return 0

File bin/Python/helper/configure_virtualenv

 #!/bin/bash
-logInfo "$BASH_SOURCE" "$LINENO" 'Configuring Python virtualenv...'
+logInfo 'Configuring Python virtualenv...'
 
-requireVariable "$BASH_SOURCE" "$LINENO" BO_Project || return 1
+requireVariable BO_Project || return 1
 _Script=$BO_Project/PVE/bin/activate
 
 # Verify PIP integration
-requireVariable "$BASH_SOURCE" "$LINENO" PIP_DOWNLOAD_CACHE     || return 1
-requireVariable "$BASH_SOURCE" "$LINENO" PIP_REQUIRE_VIRTUALENV || return 1
-requireVariable "$BASH_SOURCE" "$LINENO" PIP_RESPECT_VIRTUALENV || return 1
+requireVariable PIP_DOWNLOAD_CACHE     || return 1
+requireVariable PIP_REQUIRE_VIRTUALENV || return 1
+requireVariable PIP_RESPECT_VIRTUALENV || return 1
 
 # If the virtual environment does not already exist, create it
 if [[ ! -f "${_Script}" ]]; then
-  logWarn "$BASH_SOURCE" "$LINENO" 'Creating Python virtual environment (PVE)'
+  logWarn 'Creating Python virtual environment (PVE)'
   virtualenv --no-site-packages $BO_Project/PVE
-  abortOnFail "$BASH_SOURCE" "$LINENO" $?
+  abortOnFail $? || return 1
 fi
 
 # Activate the Python virtual environment (PVE)
 requireDirectory $BO_Project/PVE                     || return 1
 requireFile ${_Script}                               || return 1
 source ${_Script}                                    || return 1
-requireVariable "$BASH_SOURCE" "$LINENO" VIRTUAL_ENV || return 1
+requireVariable VIRTUAL_ENV || return 1
 export PYTHONHOME=$VIRTUAL_ENV
-requireVariable "$BASH_SOURCE" "$LINENO" PYTHONHOME  || return 1
+requireVariable PYTHONHOME  || return 1
 
 # Return, but do NOT exit, with a success code
 return 0