diff --git a/install.sh b/install.sh index 15da7fa..03e5f86 100644 --- a/install.sh +++ b/install.sh @@ -18,28 +18,28 @@ COMON_INSTALL_PATHS="$HOME/.local/bin $HOME/.bin $HOME/bin" INSTALL_PATH="" for p in $COMON_INSTALL_PATHS; do - if [ -d $p ]; then - INSTALL_PATH=$p - break - fi + if [ -d $p ]; then + INSTALL_PATH=$p + break + fi done # check if the user has write access to the INSTALL_PATH if [ -z "$INSTALL_PATH" ]; then - INSTALL_PATH="/usr/local/bin" - if [ ! -w $INSTALL_PATH ]; then - echo "You don't have write access to $INSTALL_PATH" - echo "Please, run with sudo or install locally" - exit 1 - fi + INSTALL_PATH="/usr/local/bin" + if [ ! -w $INSTALL_PATH ]; then + echo "You don't have write access to $INSTALL_PATH" + echo "Please, run with sudo or install locally" + exit 1 + fi fi # ensure that $INSTALL_PATH is in the PATH -if ! echo $PATH | grep -q $INSTALL_PATH; then - echo "Sorry, $INSTALL_PATH is not in the PATH" - echo "Please, add it to your PATH in your shell configuration file" - echo "then restart your shell and run this script again" - exit 1 +if ! echo "$PATH" | grep -q "$INSTALL_PATH"; then + echo "Sorry, ${INSTALL_PATH} is not in the PATH" + echo "Please, add it to your PATH in your shell configuration file" + echo "then restart your shell and run this script again" + exit 1 fi # Where to download the binary @@ -47,7 +47,7 @@ BASE="https://github.com/metal3d/katenary/releases/latest/download/" # for compatibility with older ARM versions if [ $ARCH = "x86_64" ]; then - ARCH="amd64" + ARCH="amd64" fi BIN_URL="$BASE/katenary-$OS-$ARCH" @@ -58,8 +58,8 @@ echo "Downloading $BIN_URL" T=$(mktemp -u) curl -SL -# $BIN_URL -o $T || (echo "Failed to download katenary" && rm -f $T && exit 1) -mv $T $INSTALL_PATH/katenary -chmod +x $INSTALL_PATH/katenary +mv "$T" "${INSTALL_PATH}/katenary" +chmod +x "${INSTALL_PATH}/katenary" echo echo "Installed to $INSTALL_PATH/katenary" echo "Installation complete! Run 'katenary help' to get started."