mirror of
https://github.com/webinstall/webi-installers.git
synced 2026-02-14 17:49:53 +00:00
fix(bootstrap): POSIX doesn't define 'interactive', detect TTY instead
This commit is contained in:
@@ -64,7 +64,7 @@ t_yellow() { (fn_printf '\e[33m%s\e[39m' "${1}"); }
|
||||
fn_printf() { (
|
||||
a_style="${1}"
|
||||
a_text="${2}"
|
||||
if test -n "${WEBI_TTY}"; then
|
||||
if fn_is_tty; then
|
||||
#shellcheck disable=SC2059
|
||||
printf "${a_style}" "${a_text}"
|
||||
else
|
||||
@@ -117,7 +117,7 @@ fn_wget() { (
|
||||
a_path="${2}"
|
||||
|
||||
cmd_wget="wget -q --user-agent"
|
||||
if fn_is_interactive; then
|
||||
if fn_is_tty; then
|
||||
cmd_wget="wget -q --show-progress --user-agent"
|
||||
fi
|
||||
|
||||
@@ -142,7 +142,7 @@ fn_curl() { (
|
||||
a_path="${2}"
|
||||
|
||||
cmd_curl="curl -f -sSL -#"
|
||||
if fn_is_interactive; then
|
||||
if fn_is_tty; then
|
||||
cmd_curl="curl -f -sSL"
|
||||
fi
|
||||
|
||||
@@ -160,16 +160,6 @@ fn_curl() { (
|
||||
fi
|
||||
); }
|
||||
|
||||
fn_is_interactive() {
|
||||
# Ex:
|
||||
# himBH
|
||||
# hBc
|
||||
case $- in
|
||||
*i*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
fn_get_target_triple_user_agent() { (
|
||||
# Ex:
|
||||
# x86_64/unknown Linux/5.15.107-2-pve gnu
|
||||
@@ -243,6 +233,13 @@ fn_sub_home() { (
|
||||
echo "${my_abs}" | sed "s:^${my_rel}:~:"
|
||||
); }
|
||||
|
||||
fn_is_tty() {
|
||||
if test "${WEBI_TTY}" = 'tty'; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
fn_detect_tty() { (
|
||||
# stdin will NOT be a tty if it's being piped
|
||||
# stdout & stderr WILL be a tty even when piped
|
||||
|
||||
Reference in New Issue
Block a user