From 602cea3ce901a452d8666cfa68305a39ff58342a Mon Sep 17 00:00:00 2001 From: DaniPopes <57450786+DaniPopes@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:44:20 +0200 Subject: [PATCH] fix(foundryup): address shellcheck in installer (#7168) * fix(foundryup): address shellcheck in installer * formatting --- foundryup/install | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/foundryup/install b/foundryup/install index 0c6f7b1f15bd..19bfe573873d 100755 --- a/foundryup/install +++ b/foundryup/install @@ -1,29 +1,28 @@ #!/usr/bin/env bash -set -e +set -eo pipefail -echo Installing foundryup... +echo "Installing foundryup..." -BASE_DIR=${XDG_CONFIG_HOME:-$HOME} -FOUNDRY_DIR=${FOUNDRY_DIR-"$BASE_DIR/.foundry"} +BASE_DIR="${XDG_CONFIG_HOME:-$HOME}" +FOUNDRY_DIR="${FOUNDRY_DIR-"$BASE_DIR/.foundry"}" FOUNDRY_BIN_DIR="$FOUNDRY_DIR/bin" FOUNDRY_MAN_DIR="$FOUNDRY_DIR/share/man/man1" BIN_URL="https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup" BIN_PATH="$FOUNDRY_BIN_DIR/foundryup" - # Create the .foundry bin directory and foundryup binary if it doesn't exist. -mkdir -p $FOUNDRY_BIN_DIR -curl -# -L $BIN_URL -o $BIN_PATH -chmod +x $BIN_PATH +mkdir -p "$FOUNDRY_BIN_DIR" +curl -sSf -L "$BIN_URL" -o "$BIN_PATH" +chmod +x "$BIN_PATH" # Create the man directory for future man files if it doesn't exist. -mkdir -p $FOUNDRY_MAN_DIR +mkdir -p "$FOUNDRY_MAN_DIR" # Store the correct profile file (i.e. .profile for bash or .zshenv for ZSH). case $SHELL in */zsh) - PROFILE=${ZDOTDIR-"$HOME"}/.zshenv + PROFILE="${ZDOTDIR-"$HOME"}/.zshenv" PREF_SHELL=zsh ;; */bash) @@ -46,7 +45,7 @@ esac # Only add foundryup if it isn't already in PATH. if [[ ":$PATH:" != *":${FOUNDRY_BIN_DIR}:"* ]]; then # Add the foundryup directory to the path and ensure the old PATH variables remain. - echo >> $PROFILE && echo "export PATH=\"\$PATH:$FOUNDRY_BIN_DIR\"" >> $PROFILE + echo >> "$PROFILE" && echo "export PATH=\"\$PATH:$FOUNDRY_BIN_DIR\"" >> "$PROFILE" fi # Warn MacOS users that they may need to manually install libusb via Homebrew: @@ -54,5 +53,7 @@ if [[ "$OSTYPE" =~ ^darwin ]] && [[ ! -f /usr/local/opt/libusb/lib/libusb-1.0.0. echo && echo "warning: libusb not found. You may need to install it manually on MacOS via Homebrew (brew install libusb)." fi -echo && echo "Detected your preferred shell is ${PREF_SHELL} and added foundryup to PATH. Run 'source ${PROFILE}' or start a new terminal session to use foundryup." +echo +echo "Detected your preferred shell is $PREF_SHELL and added foundryup to PATH." +echo "Run 'source $PROFILE' or start a new terminal session to use foundryup." echo "Then, simply run 'foundryup' to install Foundry."