From 8084c2e61d19c18709a42e88e2f77cdcb6ef8abe Mon Sep 17 00:00:00 2001 From: AppleTheGolden Date: Fri, 20 Dec 2019 16:54:40 +0100 Subject: [PATCH] fix: Fix shellcheck issues in install.sh (#714) --- install/install.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/install/install.sh b/install/install.sh index 94b87e43..298a3da1 100755 --- a/install/install.sh +++ b/install/install.sh @@ -31,7 +31,6 @@ GREEN="$(tput setaf 2 2>/dev/null || echo '')" YELLOW="$(tput setaf 3 2>/dev/null || echo '')" BLUE="$(tput setaf 4 2>/dev/null || echo '')" MAGENTA="$(tput setaf 5 2>/dev/null || echo '')" -CYAN="$(tput setaf 6 2>/dev/null || echo '')" NO_COLOR="$(tput sgr0 2>/dev/null || echo '')" info() { @@ -89,7 +88,8 @@ fetch() { # - linux # - linux_musl (Alpine) detect_platform() { - local platform="$(uname -s | tr '[:upper:]' '[:lower:]')" + local platform + platform="$(uname -s | tr '[:upper:]' '[:lower:]')" # check for MUSL if [ "${platform}" = "linux" ]; then @@ -118,7 +118,8 @@ detect_platform() { # - x86_64 # - i386 detect_arch() { - local arch="$(uname -m | tr '[:upper:]' '[:lower:]')" + local arch + arch="$(uname -m | tr '[:upper:]' '[:lower:]')" # `uname -m` in some cases mis-reports 32-bit OS as 64-bit, so double check if [ "${arch}" = "x64" ] && [ "$(getconf LONG_BIT)" -eq 32 ]; then @@ -132,7 +133,7 @@ confirm() { if [ -z "${FORCE-}" ]; then printf "${MAGENTA}?${NO_COLOR} $@ ${BOLD}[y/N]${NO_COLOR} " set +e - read yn < /dev/tty + read -r yn < /dev/tty rc=$? set -e if [ $rc -ne 0 ]; then @@ -150,7 +151,8 @@ check_bin_dir() { local bin_dir="$1" # https://stackoverflow.com/a/11655875 - local good=$( IFS=: + local good + good=$( IFS=: for path in $PATH; do if [ "${path}" = "${bin_dir}" ]; then echo 1 @@ -217,7 +219,7 @@ info "${BOLD}Platform${NO_COLOR}: ${GREEN}${PLATFORM}${NO_COLOR}" info "${BOLD}Arch${NO_COLOR}: ${GREEN}${ARCH}${NO_COLOR}" # non-empty VERBOSE enables verbose untarring -if [ ! -z "${VERBOSE-}" ]; then +if [ -n "${VERBOSE-}" ]; then VERBOSE=v info "${BOLD}Verbose${NO_COLOR}: yes" else