Merge branch 'main' into release

install.sh

@@ -29,7 +29,7 @@ success "Utilities installed to ${COMMON_UTILS}"
 
 cat <<EOF >${HOME}/.commonrc
 export COMMON_UTILS=${COMMON_UTILS}
-source ${COMMON_UTILS}/utils
+source ${COMMON_UTILS}/utils.sh
 addpath ${COMMON_UTILS}
 EOF
 msg "Initialization configured to ${HOME}/.commonrc - source it from your .$(basename ${SHELL})rc"

scripts/build.sh

@@ -15,13 +15,13 @@
 
 set -eu
 
-if [[ -z ${UTILS_DIR} || ! -d ${UTILS_DIR} ]]; then
+if [[ -z ${COMMON_UTILS} || ! -d ${COMMON_UTILS} ]]; then
     echo "[ERROR] The \$UTILS_DIR env var must be defined and " \
          "point to the directory which contains the Common Utilities"
     exit 1
 fi
 
-source "${UTILS_DIR}"/utils
+source "${COMMON_UTILS}"/utils.sh
 source env.sh
 
 BUILD=${1:-Debug}
@@ -34,7 +34,7 @@ if [[ -f conanfile.txt ]]; then
     success "Dependencies installed"
 fi
 
-UTILS="-DCOMMON_UTILS_DIR=${UTILS_DIR}"
+UTILS="-DCOMMON_UTILS_DIR=${COMMON_UTILS}"
 
 cd "${BUILDDIR}"
 cmake -DCMAKE_CXX_COMPILER="${CLANG}" \

scripts/runtests.sh

@@ -11,13 +11,13 @@
 
 set -eu
 
-if [[ -z ${UTILS_DIR} || ! -d ${UTILS_DIR} ]]; then
+if [[ -z ${COMMON_UTILS} || ! -d ${COMMON_UTILS} ]]; then
     echo "[ERROR] The \$UTILS_DIR env var must be defined and " \
          "point to the directory which contains the Common Utilities"
     exit 1
 fi
 
-source ${UTILS_DIR}/utils
+source ${COMMON_UTILS}/utils.sh
 source env.sh
 
 verbose=""

settings.yaml

@@ -7,7 +7,7 @@ name: application-name
 
 # Manually update this value to change the semantic version
 # of your binary/container image.
-version: 0.10.0
+version: 0.10.1
 description: "Common utilities for Shell Scripts"
 author: Marco Massenzio (marco@alertavert.com)
 license: Apache-2.0