Revert "Various minor fixes to bootstrap scripts"

1 files changed, 5 insertions, 19 deletions

diff --git a/bootstrap-cpp.sh b/bootstrap-cpp.sh
index 47d2a82622a..0b1d5751e96 100755
--- a/bootstrap-cpp.sh
+++ b/bootstrap-cpp.sh
@@ -5,10 +5,9 @@ usage() {
     echo "Usage: $0 <source-dir> <build-dir>" >&2
 }
 
-# Parse arguments
 if [ $# -eq 2 ]; then
-    SOURCE_DIR="$1"
-    BUILD_DIR="$2"
+    SOURCE_DIR=$(realpath $1)
+    BUILD_DIR=$(realpath $2)
 elif [[ $# -eq 1 && ( "$1" = "-h" || "$1" = "--help" )]]; then
     usage
     exit 0
@@ -18,23 +17,10 @@ else
     exit 1
 fi
 
-# Check the source directory
-if [ ! -d "$SOURCE_DIR" ] ; then
-    echo "Source dir $SOURCE_DIR not found" >&2
-    exit 1
-fi
-SOURCE_DIR=$(realpath "${SOURCE_DIR}")
-
-# Check (and possibly create) the build directory
-mkdir -p "${BUILD_DIR}" || {
-    echo "Failed to create build directory" >&2
-    exit 1
-}
-BUILD_DIR=$(realpath "${BUILD_DIR}")
+mkdir -p "${BUILD_DIR}"
 
-# Build it
 source /opt/rh/devtoolset-6/enable || true
 cd "${SOURCE_DIR}"
-bash ./bootstrap.sh full
+sh ./bootstrap.sh full
 cd "${BUILD_DIR}"
-bash ${SOURCE_DIR}/bootstrap-cmake.sh "${SOURCE_DIR}"
+sh ${SOURCE_DIR}/bootstrap-cmake.sh ${SOURCE_DIR}