Merge pull request #27 from bandi13/forceInstallLocations

Force the installation paths to the wolfProvider root directory

Author: SparkiDev

scripts/test-openssl.sh

@@ -245,7 +245,7 @@ evp_libctx_test_run() {
 # Start
 #
 
-WOLFPROV_DIR=$PWD
+WOLFPROV_DIR=${SCRIPT_DIR}/..
 WOLFPROV_CONFIG=$WOLFPROV_DIR/provider.conf
 WOLFPROV_PATH=$WOLFPROV_DIR/.libs
 LOGDIR=$WOLFPROV_DIR/scripts/log

scripts/test-wp-cs.sh

@@ -221,7 +221,7 @@ do_client_test() { # usage: do_client_test [extraArgs]
 
 FAIL=0
 
-WOLFPROV_DIR=$PWD
+WOLFPROV_DIR=$SCRIPT_DIR/..
 WOLFPROV_NAME="libwolfprov"
 WOLFPROV_PATH=$WOLFPROV_DIR/.libs
 
@@ -239,6 +239,15 @@ else
 fi
 printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
 
+if [ "${AM_BWRAPPED-}" != "yes" ]; then
+    bwrap_path="$(command -v bwrap)"
+    if [ -n "$bwrap_path" ]; then
+        export AM_BWRAPPED=yes
+        exec "$bwrap_path" --unshare-net --dev-bind / / "$0" "$@"
+    fi
+    unset AM_BWRAPPED
+fi
+
 # Set up wolfProvider
 cd ${WOLFPROV_DIR}
 if [ ! -e "${WOLFPROV_DIR}/configure" ]; then
@@ -253,15 +262,6 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-if [ "${AM_BWRAPPED-}" != "yes" ]; then
-    bwrap_path="$(command -v bwrap)"
-    if [ -n "$bwrap_path" ]; then
-        export AM_BWRAPPED=yes
-        exec "$bwrap_path" --unshare-net --dev-bind / / "$0" "$@"
-    fi
-    unset AM_BWRAPPED
-fi
-
 make test >>$LOG_FILE 2>&1
 if [ $? != 0 ]; then
   printf "\n\n...\n"

scripts/utils-openssl.sh

@@ -23,16 +23,17 @@
 # OpenSSL 3.0.0
 #
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 OPENSSL_GIT="https://github.com/openssl/openssl.git"
 OPENSSL_TAG=${OPENSSL_TAG:-"openssl-3.0.0"}
-OPENSSL_SOURCE_DIR=$PWD/openssl-source
-OPENSSL_INSTALL_DIR=$PWD/openssl-install
+OPENSSL_SOURCE_DIR=${SCRIPT_DIR}/../openssl-source
+OPENSSL_INSTALL_DIR=${SCRIPT_DIR}/../openssl-install
 
 NUMCPU=${NUMCPU:-8}
 
 clone_openssl() {
     if [ -d ${OPENSSL_SOURCE_DIR} ]; then
-        OPENSSL_TAG_CUR=$(cd ${OPENSSL_SOURCE_DIR} && (git describe --tags || git branch --show-current))
+        OPENSSL_TAG_CUR=$(cd ${OPENSSL_SOURCE_DIR} && (git describe --tags 2>/dev/null || git branch --show-current))
         if [ "${OPENSSL_TAG_CUR}" != "${OPENSSL_TAG}" ]; then # force a rebuild
             printf "Version inconsistency. Please fix ${OPENSSL_SOURCE_DIR} (expected: ${OPENSSL_TAG}, got: ${OPENSSL_TAG_CUR})\n"
             do_cleanup

scripts/utils-wolfssl.sh

@@ -23,15 +23,16 @@
 # wolfSSL 5.0.0
 #
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 WOLFSSL_GIT="https://github.com/wolfSSL/wolfssl.git"
 WOLFSSL_TAG=${WOLFSSL_TAG:-"v5.6.3-stable"}
-WOLFSSL_SOURCE_DIR=$PWD/wolfssl-source
-WOLFSSL_INSTALL_DIR=$PWD/wolfssl-install
+WOLFSSL_SOURCE_DIR=${SCRIPT_DIR}/../wolfssl-source
+WOLFSSL_INSTALL_DIR=${SCRIPT_DIR}/../wolfssl-install
 
 # Depends on OPENSSL_INSTALL_DIR
 clone_wolfssl() {
     if [ -d ${WOLFSSL_SOURCE_DIR} ]; then
-        WOLFSSL_TAG_CUR=$(cd ${WOLFSSL_SOURCE_DIR} && (git describe --tags || git branch --show-current))
+        WOLFSSL_TAG_CUR=$(cd ${WOLFSSL_SOURCE_DIR} && (git describe --tags 2>/dev/null || git branch --show-current))
         if [ "${WOLFSSL_TAG_CUR}" != "${WOLFSSL_TAG}" ]; then # force a rebuild
             printf "Version inconsistency. Please fix ${WOLFSSL_SOURCE_DIR} (expected: ${WOLFSSL_TAG}, got: ${WOLFSSL_TAG_CUR})\n"
             do_cleanup