less bash, yay

Dane Springmeyer · Dane Springmeyer · commit 44211bf9b330 · 2018-03-16T16:48:25.000-07:00
diff --git a/scripts/clang-format.sh b/scripts/clang-format.sh
@@ -15,23 +15,6 @@ Returns `0` if everything looks properly formatted.
 
 PATH_TO_FORMAT_SCRIPT="$(pwd)/mason_packages/.link/bin/clang-format"
 
-# to speed up re-runs, only re-create environment if needed
-if [[ ! -f local.env ]] || [[ ! -f ${PATH_TO_FORMAT_SCRIPT} ]]; then
-    # automatically setup environment
-    ./scripts/setup.sh --config local.env
-fi
-
-# source the environment
-source local.env
-
-# to speed up re-runs, only install clang-format if needed
-if [[ ! -f ${PATH_TO_FORMAT_SCRIPT} ]]; then
-    # The MASON_LLVM_RELEASE variable comes from `local.env`
-    node_modules/.bin/mason-js install clang-format=${MASON_LLVM_RELEASE} --type=compiled
-    node_modules/.bin/mason-js link clang-format=${MASON_LLVM_RELEASE} --type=compiled
-    # We link the tools to make it easy to know ${PATH_TO_FORMAT_SCRIPT}
-fi
-
 # Run clang-format on all cpp and hpp files in the /src directory
 find src/ -type f -name '*.hpp' -o -name '*.cpp' \
  | xargs -I{} ${PATH_TO_FORMAT_SCRIPT} -i -style=file {}
diff --git a/scripts/clang-tidy.sh b/scripts/clang-tidy.sh
@@ -16,15 +16,8 @@ always returns 0 even on errors.
 '
 
 PATH_TO_CLANG_TIDY_SCRIPT="$(pwd)/mason_packages/.link/share/run-clang-tidy.py"
-
-# to speed up re-runs, only re-create environment if needed
-if [[ ! -f local.env ]] || [[ ! -f ${PATH_TO_CLANG_TIDY_SCRIPT} ]]; then
-    # automatically setup environment
-    ./scripts/setup.sh --config local.env
-fi
-
-# source the environment
-source local.env
+# make sure that run-clang-tidy.py can find the right clang-tidy
+export PATH=$(pwd)/mason_packages/.link/bin:${PATH}
 
 # build the compile_commands.json file if it does not exist
 if [[ ! -f build/compile_commands.json ]]; then
@@ -40,14 +33,6 @@ if [[ ! -f build/compile_commands.json ]]; then
     make | scripts/generate_compile_commands.py > build/compile_commands.json
 fi
 
-# to speed up re-runs, only install clang-tidy if needed
-if [[ ! -f ${PATH_TO_CLANG_TIDY_SCRIPT} ]]; then
-    # The MASON_LLVM_RELEASE variable comes from `local.env`
-    node_modules/.bin/mason-js install clang-tidy=${MASON_LLVM_RELEASE} --type=compiled
-    node_modules/.bin/mason-js link clang-tidy=${MASON_LLVM_RELEASE} --type=compiled
-    # We link the tools to make it easy to know ${PATH_TO_CLANG_TIDY_SCRIPT}
-fi
-
 # change into the build directory so that clang-tidy can find the files
 # at the right paths (since this is where the actual build happens)
 cd build
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -6,15 +6,6 @@ set -o pipefail
 export MASON_RELEASE="${MASON_RELEASE:-eeba3b5}"
 export MASON_LLVM_RELEASE="${MASON_LLVM_RELEASE:-5.0.0}"
 
-PLATFORM=$(uname | tr A-Z a-z)
-if [[ ${PLATFORM} == 'darwin' ]]; then
-  PLATFORM="osx"
-fi
-
-MASON_URL="https://s3.amazonaws.com/mason-binaries/${PLATFORM}-$(uname -m)"
-
-llvm_toolchain_dir="$(pwd)/.toolchain"
-
 function run() {
     local config=${1}
     # unbreak bash shell due to rvm bug on osx: https://github.com/direnv/direnv/issues/210#issuecomment-203383459
@@ -23,14 +14,6 @@ function run() {
       echo 'shell_session_update() { :; }' > ~/.direnvrc
     fi
 
-    # Ensure toolchain is installed via mason-js
-    if [[ ! -f ./node_modules/.bin/mason-js ]]; then
-      npm install mason-js-sdk
-    fi
-
-    node_modules/.bin/mason-js install clang++=${MASON_LLVM_RELEASE} --type=compiled
-    node_modules/.bin/mason-js link clang++=${MASON_LLVM_RELEASE} --type=compiled
-
     #
     # ENV SETTINGS
     #
