haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Fix shellcheck issues in install.sh (#714)

This commit is contained in:
AppleTheGolden 2019-12-20 16:54:40 +01:00 committed by Matan Kushner
parent c58178dece
commit 8084c2e61d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install/install.sh
View File

@ -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