Merge pull request #365 from pmienk/script-corrections

Script corrections identified or pointed out by 'otto'.

Author: pmienk

templates/gsl.developer_setup.sh

@@ -274,7 +274,7 @@ make_jobs()
     fi
 
     # Avoid setting -j1 (causes problems on Travis).
-    if [[ $JOBS > $SEQUENTIAL ]]; then
+    if [[ $JOBS -gt $SEQUENTIAL ]]; then
         make -j"$JOBS" "$@"
     else
         make "$@"

templates/gsl.install-cmake.sh

@@ -49,14 +49,14 @@ endfunction
 .endmacro # custom_documentation
 .
 .macro custom_configuration(repository, install)
-    display_message "BUILD_DIR                      : $BUILD_DIR"
+    display_message "BUILD_SRC_DIR                  : $BUILD_SRC_DIR"
     display_message "CUMULATIVE_FILTERED_ARGS       : $CUMULATIVE_FILTERED_ARGS"
     display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
 .endmacro # custom_configuration
 .
 .macro custom_script_options()
             # Unique script options.
-            (--build-dir=*)         BUILD_DIR="${OPTION#*=}";;
+            (--build-dir=*)         BUILD_SRC_DIR="${OPTION#*=}";;
 
             # Handle ndebug declarations due to disabled argument passthrough
             (--enable-ndebug)       ENABLE_NDEBUG="yes";;
@@ -67,7 +67,7 @@ endfunction
 .macro define_build_variables_custom(repository)
 .   define my.repo = define_build_variables_custom.repository
 .   heading2("The default build directory.")
-BUILD_DIR="build-$(my.repo.name)"
+BUILD_SRC_DIR="build-$(my.repo.name)"
 
 PRESUMED_CI_PROJECT_PATH=\$(pwd)
 
@@ -279,13 +279,13 @@ make_jobs()
     shift 1
 
     VERBOSITY=""
-    if [[ DISPLAY_VERBOSE ]]; then
+    if [[ $DISPLAY_VERBOSE ]]; then
         VERBOSITY="VERBOSE=1"
     fi
 
     SEQUENTIAL=1
     # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
-    if [[ $JOBS > $SEQUENTIAL ]]; then
+    if [[ $JOBS -gt $SEQUENTIAL ]]; then
         make -j"$JOBS" "$@" $VERBOSITY
     else
         make "$@" $VERBOSITY
@@ -436,10 +436,10 @@ build_all()
 display_configuration
 
 if [[ ! ($CI == true) ]]; then
-    create_directory "$BUILD_DIR"
-    push_directory "$BUILD_DIR"
+    create_directory "$BUILD_SRC_DIR"
+    push_directory "$BUILD_SRC_DIR"
 else
-    push_directory "$BUILD_DIR"
+    push_directory "$BUILD_SRC_DIR"
 fi
 
 initialize_git

templates/gsl.install-cmakepresets.sh

@@ -60,15 +60,15 @@ declare -A REPO_PRESET
 .endmacro # custom_documentation
 .
 .macro custom_configuration(repository, install)
-    display_message "BUILD_DIR                      : $BUILD_DIR"
+    display_message "BUILD_SRC_DIR                  : $BUILD_SRC_DIR"
     display_message "PRESET_ID                      : $PRESET_ID"
     display_message "CUMULATIVE_FILTERED_ARGS       : $CUMULATIVE_FILTERED_ARGS"
     display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
 .endmacro # custom_configuration
 .
 .macro custom_script_options()
             # Unique script options.
-            (--build-dir=*)         BUILD_DIR="${OPTION#*=}";;
+            (--build-dir=*)         BUILD_SRC_DIR="${OPTION#*=}";;
             (--preset=*)            PRESET_ID="${OPTION#*=}";;
 
             # Handle ndebug declarations due to disabled argument passthrough
@@ -80,7 +80,7 @@ declare -A REPO_PRESET
 .macro define_build_variables_custom(repository)
 .   define my.repo = define_build_variables_custom.repository
 .   heading2("The default build directory.")
-BUILD_DIR="build-$(my.repo.name)"
+BUILD_SRC_DIR="build-$(my.repo.name)"
 
 PRESUMED_CI_PROJECT_PATH=\$(pwd)
 
@@ -377,13 +377,13 @@ make_jobs()
     shift 1
 
     VERBOSITY=""
-    if [[ DISPLAY_VERBOSE ]]; then
+    if [[ $DISPLAY_VERBOSE ]]; then
         VERBOSITY="VERBOSE=1"
     fi
 
     SEQUENTIAL=1
     # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
-    if [[ $JOBS > $SEQUENTIAL ]]; then
+    if [[ $JOBS -gt $SEQUENTIAL ]]; then
         make -j"$JOBS" "$@" $VERBOSITY
     else
         make "$@" $VERBOSITY
@@ -538,10 +538,10 @@ build_all()
 display_configuration
 
 if [[ ! ($CI == true) ]]; then
-    create_directory "$BUILD_DIR"
-    push_directory "$BUILD_DIR"
+    create_directory "$BUILD_SRC_DIR"
+    push_directory "$BUILD_SRC_DIR"
 else
-    push_directory "$BUILD_DIR"
+    push_directory "$BUILD_SRC_DIR"
 fi
 
 initialize_git

templates/gsl.install.sh

@@ -49,18 +49,18 @@ endfunction
 .endmacro # custom_documentation
 .
 .macro custom_configuration(repository, install)
-    display_message "BUILD_DIR             : $BUILD_DIR"
+    display_message "BUILD_SRC_DIR          : $BUILD_SRC_DIR"
 .endmacro # custom_configuration
 .
 .macro custom_script_options()
             # Unique script options.
-            (--build-dir=*)    BUILD_DIR="${OPTION#*=}";;
+            (--build-dir=*)    BUILD_SRC_DIR="${OPTION#*=}";;
 .endmacro # custom_script_options
 .
 .macro define_build_variables_custom(repository)
 .   define my.repo = define_build_variables_custom.repository
 .   heading2("The default build directory.")
-BUILD_DIR="build-$(my.repo.name)"
+BUILD_SRC_DIR="build-$(my.repo.name)"
 
 PRESUMED_CI_PROJECT_PATH=\$(pwd)
 
@@ -127,13 +127,13 @@ make_jobs()
     shift 1
 
     VERBOSITY=""
-    if [[ DISPLAY_VERBOSE ]]; then
+    if [[ $DISPLAY_VERBOSE ]]; then
         VERBOSITY="VERBOSE=1"
     fi
 
     SEQUENTIAL=1
     # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
-    if [[ $JOBS > $SEQUENTIAL ]]; then
+    if [[ $JOBS -gt $SEQUENTIAL ]]; then
         make -j"$JOBS" "$@" $VERBOSITY
     else
         make "$@" $VERBOSITY
@@ -261,10 +261,10 @@ build_all()
 display_configuration
 
 if [[ ! ($CI == true) ]]; then
-    create_directory "$BUILD_DIR"
-    push_directory "$BUILD_DIR"
+    create_directory "$BUILD_SRC_DIR"
+    push_directory "$BUILD_SRC_DIR"
 else
-    push_directory "$BUILD_DIR"
+    push_directory "$BUILD_SRC_DIR"
 fi
 
 initialize_git