Remove useless variables

cling/install.sh

@@ -2,13 +2,6 @@
 
 source ../common.sh
 
-################################################################################
-# GENERIC: Base directory for source, install, build.
-SOURCE_BASE_DIR=${PREWORK_DIR}
-BUILD_BASE_DIR=${PREWORK_DIR}
-INSTALL_BASE_DIR=${PREINSTALL_DIR}
-MODULE_BASE_DIR=${PREMODULE_DIR}
-################################################################################
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 LIB_NAME="cling"
@@ -32,10 +25,10 @@ GCC_VERSION_PATCH=`echo "${GCC_VERSION}" | sed 's/[0-9][.][0-9][.]\([0-9]\)/\1/g
 DEPEND_GCC=gcc-${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
 DEPEND_MODULE_GCC=gcc${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
 
-SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
-BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
-INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
-MODULE_DIR=${MODULE_BASE_DIR}/compilers/${LIB_NAME}
+SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+BUILD_DIR=${PREBUILD_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
+INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+MODULE_DIR=${PREMODULE_DIR}/compilers/${LIB_NAME}
 MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_GCC}
 
 

fmilib/install.sh

 #!/bin/bash
 set -x
 
-################################################################################
-# GENERIC: Base directory for source, install, build.
-SOURCE_BASE_DIR=${PREWORK_DIR}
-BUILD_BASE_DIR=${PREWORK_DIR}
-INSTALL_BASE_DIR=${PREINSTALL_DIR}
-MODULE_BASE_DIR=${PREMODULE_DIR}
 MODULE_CATEGORY="libs"
-################################################################################
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 LIB_NAME="fmilib"
@@ -30,10 +23,10 @@ GCC_VERSION_PATCH=`echo "${GCC_VERSION}" | sed 's/[0-9][.][0-9][.]\([0-9]\)/\1/g
 DEPEND_GCC=gcc-${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
 DEPEND_MODULE_GCC=gcc${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
 
-SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
-BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
-INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
-MODULE_DIR=${MODULE_BASE_DIR}/${MODULE_CATEGORY}/${LIB_NAME}
+SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+BUILD_DIR=${PREBUILD_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
+INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+MODULE_DIR=${PREMODULE_DIR}/${MODULE_CATEGORY}/${LIB_NAME}
 MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_GCC}
 
 

mongoc/install.sh

@@ -2,13 +2,6 @@
 
 source ../common.sh
 
-################################################################################
-# GENERIC: Base directory for source, install, build.
-SOURCE_BASE_DIR=${PREWORK_DIR}
-BUILD_BASE_DIR=${PREWORK_DIR}
-INSTALL_BASE_DIR=${PREINSTALL_DIR}
-MODULE_BASE_DIR=${PREMODULE_DIR}
-################################################################################
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 LIB_NAME="mongoc"
@@ -29,10 +22,10 @@ GCC_VERSION_PATCH=`echo "${GCC_VERSION}" | sed 's/[0-9][.][0-9][.]\([0-9]\)/\1/g
 DEPEND_GCC=gcc-${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
 DEPEND_MODULE_GCC=gcc${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
 
-SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
-BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
-INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
-MODULE_DIR=${MODULE_BASE_DIR}/libs/${LIB_NAME}
+SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+BUILD_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
+INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+MODULE_DIR=${PREMODULE_DIR}/libs/${LIB_NAME}
 MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_GCC}
 
 prepare_lib()

pyfmi/install.sh

@@ -2,13 +2,6 @@
 
 source ../common.sh
 
-################################################################################
-# GENERIC: Base directory for source, install, build.
-SOURCE_BASE_DIR=${PREWORK_DIR}
-BUILD_BASE_DIR=${PREWORK_DIR}
-INSTALL_BASE_DIR=${PREINSTALL_DIR}
-MODULE_BASE_DIR=${PREMODULE_DIR}
-################################################################################
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 LIB_NAME="pyfmi"
@@ -44,14 +37,14 @@ DEPEND_MODULE_FMILIB=fmilib${FMILIB_VERSION_MAJOR}${FMILIB_VERSION_MINOR}${FMILI
 #DEPEND_GMSH=gmsh-${GMSH_VERSION}
 #DEPEND_MODULE_GMSH=gmsh-${PYTHON_VERSION_MAJOR}
 
-PYTHON2_SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}/${DEPEND_FMILIB}
-#PYTHON2_BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}/build
-PYTHON2_INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}/${DEPEND_FMILIB}
-PYTHON3_SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}/${DEPEND_FMILIB}
-#PYTHON3_BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}/build
-PYTHON3_INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}/${DEPEND_FMILIB}
+PYTHON2_SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}/${DEPEND_FMILIB}
+#PYTHON2_BUILD_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}/build
+PYTHON2_INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}/${DEPEND_FMILIB}
+PYTHON3_SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}/${DEPEND_FMILIB}
+#PYTHON3_BUILD_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}/build
+PYTHON3_INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}/${DEPEND_FMILIB}
 
-MODULE_DIR=${MODULE_BASE_DIR}/libs/${LIB_NAME}
+MODULE_DIR=${PREMODULE_DIR}/libs/${LIB_NAME}
 PYTHON2_MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_PYTHON2}_${DEPEND_MODULE_FMILIB}
 PYTHON3_MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_PYTHON3}_${DEPEND_MODULE_FMILIB}
 

pygmsh/install.sh

@@ -2,13 +2,6 @@
 
 source ../common.sh
 
-################################################################################
-# GENERIC: Base directory for source, install, build.
-SOURCE_BASE_DIR=${PREWORK_DIR}
-BUILD_BASE_DIR=${PREWORK_DIR}
-INSTALL_BASE_DIR=${PREINSTALL_DIR}
-MODULE_BASE_DIR=${PREMODULE_DIR}
-################################################################################
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 LIB_NAME="pygmsh"
@@ -35,14 +28,14 @@ DEPEND_MODULE_PYTHON2=python${PYTHON2_VERSION_MAJOR}
 #DEPEND_GMSH=gmsh-${GMSH_VERSION}
 #DEPEND_MODULE_GMSH=gmsh-${PYTHON_VERSION_MAJOR}
 
-PYTHON2_SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}
-#PYTHON2_BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}/build
-PYTHON2_INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}
-PYTHON3_SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}
-#PYTHON3_BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}/build
-PYTHON3_INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}
+PYTHON2_SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}
+#PYTHON2_BUILD_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}/build
+PYTHON2_INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON2}
+PYTHON3_SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}
+#PYTHON3_BUILD_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}/build
+PYTHON3_INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON3}
 
-MODULE_DIR=${MODULE_BASE_DIR}/libs/${LIB_NAME}
+MODULE_DIR=${PREMODULE_DIR}/libs/${LIB_NAME}
 PYTHON2_MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_PYTHON2}
 PYTHON3_MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_PYTHON3}
 

singularity/install.sh

@@ -2,13 +2,6 @@
 
 source ../common.sh
 
-################################################################################
-# GENERIC: Base directory for source, install, build.
-SOURCE_BASE_DIR=${PREWORK_DIR}
-BUILD_BASE_DIR=${PREWORK_DIR}
-INSTALL_BASE_DIR=${PREINSTALL_DIR}
-MODULE_BASE_DIR=${PREMODULE_DIR}
-################################################################################
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 LIB_NAME="singularity"
@@ -29,10 +22,10 @@ GCC_VERSION_PATCH=`echo "${GCC_VERSION}" | sed 's/[0-9][.][0-9][.]\([0-9]\)/\1/g
 DEPEND_GCC=gcc-${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
 DEPEND_MODULE_GCC=gcc${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
 
-SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
-BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
-INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
-MODULE_DIR=${MODULE_BASE_DIR}/tools/${LIB_NAME}
+SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+BUILD_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
+INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+MODULE_DIR=${PREMODULE_DIR}/tools/${LIB_NAME}
 MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_GCC}
 
 

sympy/install.sh

@@ -2,13 +2,6 @@
 
 source ../common.sh
 
-################################################################################
-# GENERIC: Base directory for source, install, build.
-SOURCE_BASE_DIR=${PREWORK_DIR}
-BUILD_BASE_DIR=${PREWORK_DIR}
-INSTALL_BASE_DIR=${PREINSTALL_DIR}
-MODULE_BASE_DIR=${PREMODULE_DIR}
-################################################################################
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 LIB_NAME="sympy"
@@ -25,10 +18,10 @@ PYTHON_VERSION_PATCH=`echo "${PYTHON_VERSION}" | sed 's/[0-9][.][0-9][.]\([0-9]\
 DEPEND_PYTHON=python-${PYTHON_VERSION_MAJOR}
 DEPEND_MODULE_PYTHON=python${PYTHON_VERSION_MAJOR}
 
-SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON}
-BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON}/build
-INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON}
-MODULE_DIR=${MODULE_BASE_DIR}/libs/${LIB_NAME}
+SOURCE_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON}
+BUILD_DIR=${PREWORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON}/build
+INSTALL_DIR=${PREINSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_PYTHON}
+MODULE_DIR=${PREMODULE_DIR}/libs/${LIB_NAME}
 MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_PYTHON}
 
 install_lib()