improve script

facebookincubator · Mar 1, 2024 · 52835dc · 52835dc
1 parent 7b210f9
commit 52835dc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/scripts/setup-centos8.sh b/scripts/setup-centos8.sh
@@ -25,7 +25,7 @@
 # $ scripts/setup-macos.sh install_googletest install_fmt
 #
 
-set -eufx -o pipefail
+set -efx -o pipefail
 # Some of the packages must be build with the same compiler flags
 # so that some low level types are the same size. Also, disable warnings.
 SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
@@ -206,14 +206,18 @@ function install_velox_deps {
 (return 2> /dev/null) && return # If script was sourced, don't run commands.
 
 (
+  if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
+    echo "Installing build dependencies"
+    run_and_time install_build_prerequisites
+  fi
+  # Activate gcc9; enable errors on unset variables afterwards.
+  source /opt/rh/gcc-toolset-9/enable || exit 1
+  set -u
   if [[ $# -ne 0 ]]; then
     for cmd in "$@"; do
       run_and_time "${cmd}"
     done
   else
-    if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
-      run_and_time install_build_prerequisites
-    fi
     install_velox_deps
   fi
 )

diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh
@@ -142,16 +142,16 @@ function install_velox_deps {
 (return 2> /dev/null) && return # If script was sourced, don't run commands.
 
 (
-  echo "Installing mac dependencies"
+  if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
+    echo "Installing build dependencies"
+    run_and_time install_build_prerequisites
+  fi
   update_brew
   if [[ $# -ne 0 ]]; then
     for cmd in "$@"; do
       run_and_time "${cmd}"
     done
   else
-    if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
-      run_and_time install_build_prerequisites
-    fi
     install_velox_deps
   fi
 )

diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
@@ -150,14 +150,15 @@ function install_velox_deps {
 (return 2> /dev/null) && return # If script was sourced, don't run commands.
 
 (
+  if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
+    echo "Installing build dependencies"
+    run_and_time install_build_prerequisites
+  fi
   if [[ $# -ne 0 ]]; then
     for cmd in "$@"; do
       run_and_time "${cmd}"
     done
   else
-    if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
-      run_and_time install_build_prerequisites
-    fi
     install_velox_deps
   fi
 )