RomanNum3ral
/
zoxide
mirror of https://github.com/ajeetdsouza/zoxide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use RETVAL for elevate_priv 

This stops the script from breaking if the user specified sudo command outputs to stdout
This commit is contained in:
aarondill 2023-07-05 13:30:30 -05:00
parent ebebf77cc8
commit 606b2f41c3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install.sh
View File

@ -23,12 +23,12 @@ usage() {
"-h, --help" "Display this help message" "-h, --help" "Display this help message"
} }
# outputs sudo command to use to stdout, exits script if no command can be found # sets RETVAL to sudo command to use, exits script if no command can be found
# optional user command is passed as an argument, if it fails, attempts to use sudo/doas. # optional user command is passed as an argument, if it fails, attempts to use sudo/doas.
elevate_priv() { elevate_priv() {
if [ -n "${1:-}" ]; then # user input if [ -n "${1:-}" ]; then # user input
if "$1" true; then if "$1" true; then
printf '%s' "$1" RETVAL="$1"
return 0 return 0
else else
err "$1 failed. Checking sudo support." err "$1 failed. Checking sudo support."
@ -37,7 +37,7 @@ elevate_priv() {
if has_cmd sudo; then if has_cmd sudo; then
if sudo true; then if sudo true; then
printf 'sudo' RETVAL="sudo"
return 0 return 0
else else
err "Sudo failed. Checking doas support." err "Sudo failed. Checking doas support."
@ -46,7 +46,7 @@ elevate_priv() {
if has_cmd doas; then if has_cmd doas; then
if doas true; then if doas true; then
printf "doas" RETVAL="doas"
return 0 return 0
else else
err "doas failed." err "doas failed."
@ -111,7 +111,8 @@ main() {
_sudo="" _sudo=""
else else
log "Escalated permissions are required to install to ${_bin_dir}" log "Escalated permissions are required to install to ${_bin_dir}"
_sudo=$(elevate_priv "$_sudo") elevate_priv "$_sudo"
_sudo=${RETVAL}
log "Installing zoxide as root using $_sudo, please wait…" log "Installing zoxide as root using $_sudo, please wait…"
fi fi