1
0
Fork 0
mirror of https://github.com/notwa/rc synced 2024-10-18 02:11:25 -07:00

move maybesudo logic into the eponymous file

This commit is contained in:
Connor Olding 2024-07-21 22:06:15 -07:00
parent e7f15ac236
commit 731c4385cc
3 changed files with 13 additions and 6 deletions

View file

@ -26,15 +26,11 @@ if has sudo; then
printf '\033[7m %s \033[m\n' 'warning: you ran sudo when you meant doas!'
sudo "$@"
}
maybesudo() { sudo "$@"; }
elif has doas; then
sudo() {
printf '\033[7m %s \033[m\n' 'warning: you ran doas when you meant sudo!'
doas "$@"
}
maybesudo() { doas "$@"; }
else
maybesudo() (__maybesudo "$@")
fi
ADDPATH() { ### @- append a directory to `$PATH` if it isn't already present.

View file

@ -134,4 +134,16 @@ __maybesudo() { ### @maybesudo
}
maybesudo_()(__maybesudo "$@") # deprecated
[ -n "${preload+-}" ] || . ~/sh/preload || exit 2
eval ${preload:-preload} has
if has sudo; then
maybesudo() { sudo "$@"; }
elif has doas; then
maybesudo() { doas "$@"; }
else
maybesudo() (__maybesudo "$@")
fi
[ -n "${preload+-}" ] || __maybesudo "$@"

View file

@ -11,8 +11,7 @@ pippy() { ### @-
~/work/automamba --pip install --upgrade --upgrade-strategy only-if-needed "$@"
return
fi
local sudo="$(has sudo || echo maybesudo_)"
"$sudo" python3 -m pip install --upgrade --upgrade-strategy only-if-needed "$@"
maybesudo python3 -m pip install --upgrade --upgrade-strategy only-if-needed "$@"
}
[ -n "${preload+-}" ] || . ~/sh/preload || exit 2