Attempt at making shell scripts more robust

erlef · Mar 29, 2021 · 08061ca · 08061ca
1 parent 4ee73cb
commit 08061ca
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/src/install-elixir b/src/install-elixir
@@ -4,7 +4,14 @@ set -eo pipefail
 
 cd "$RUNNER_TEMP"
 
-wget -q "https://repo.hex.pm/builds/elixir/${1}${2}.zip"
-unzip -d .setup-elixir/elixir "${1}${2}.zip"
-rm -f "${1}${2}.zip"
-echo "$(pwd)/.setup-elixir/elixir/bin" >> "$GITHUB_PATH"
+FILE_INPUT=${1}${2}.zip
+FILE_OUTPUT=elixir.zip
+DIR_FOR_BIN=.setup-elixir/elixir
+
+rm -f "${FILE_OUTPUT}"
+rm -rf "${DIR_FOR_BIN}"
+wget -q -O "${FILE_OUTPUT}" "https://repo.hex.pm/builds/elixir/${FILE_INPUT}"
+mkdir -p "${DIR_FOR_BIN}"
+unzip -q -d "${DIR_FOR_BIN}" "${FILE_OUTPUT}"
+rm -f "${FILE_OUTPUT}"
+echo "$(pwd)/${DIR_FOR_BIN}/bin" >> "$GITHUB_PATH"
diff --git a/src/install-otp b/src/install-otp
@@ -5,11 +5,15 @@ set -eo pipefail
 cd "$RUNNER_TEMP"
 
 OS=${1}
-OTP=${2}
-
-wget -q -O otp.tar.gz "https://repo.hex.pm/builds/otp/${OS}/${OTP}.tar.gz"
-mkdir -p .setup-elixir/otp
-tar zxf otp.tar.gz -C .setup-elixir/otp --strip-components=1
-rm -f otp.tar.gz
-.setup-elixir/otp/Install -minimal "$(pwd)/.setup-elixir/otp"
-echo "$(pwd)/.setup-elixir/otp/bin" >> "$GITHUB_PATH"
+FILE_INPUT=${2}.tar.gz
+FILE_OUTPUT=otp.tar.gz
+DIR_FOR_BIN=.setup-elixir/otp
+
+rm -f "${FILE_OUTPUT}"
+rm -rf "${DIR_FOR_BIN}"
+wget -q -O "${FILE_OUTPUT}" "https://repo.hex.pm/builds/otp/${OS}/${FILE_INPUT}"
+mkdir -p "${DIR_FOR_BIN}"
+tar zxf "${FILE_OUTPUT}" -C "${DIR_FOR_BIN}" --strip-components=1
+rm -f "${FILE_OUTPUT}"
+"${DIR_FOR_BIN}/Install" -minimal "$(pwd)/${DIR_FOR_BIN}"
+echo "$(pwd)/${DIR_FOR_BIN}/bin" >> "$GITHUB_PATH"
diff --git a/src/install-rebar3 b/src/install-rebar3
@@ -5,11 +5,14 @@ set -eo pipefail
 cd "$RUNNER_TEMP"
 
 VSN=${1}
-FILE=rebar3
+FILE_INPUT=rebar3
+FILE_OUTPUT=rebar3
 DIR_FOR_BIN=.setup-elixir/rebar3/bin
 
-wget -q "https://github.com/erlang/rebar3/releases/download/${VSN}/${FILE}"
-mkdir -p ${DIR_FOR_BIN}
-chmod +x ${FILE}
-mv ${FILE} ${DIR_FOR_BIN}
+rm -f "${FILE_OUTPUT}"
+rm -rf "${DIR_FOR_BIN}"
+wget -q -O "${FILE_OUTPUT}" "https://github.com/erlang/rebar3/releases/download/${VSN}/${FILE_INPUT}"
+mkdir -p "${DIR_FOR_BIN}"
+chmod +x "${FILE_OUTPUT}"
+mv "${FILE_OUTPUT}" "${DIR_FOR_BIN}"
 echo "$(pwd)/${DIR_FOR_BIN}" >> "$GITHUB_PATH"