mirror of
https://github.com/notwa/rc
synced 2025-02-05 07:43:22 -08:00
move maybesudo
logic into the eponymous file
This commit is contained in:
parent
e7f15ac236
commit
731c4385cc
3 changed files with 13 additions and 6 deletions
|
@ -26,15 +26,11 @@ if has sudo; then
|
||||||
printf '\033[7m %s \033[m\n' 'warning: you ran sudo when you meant doas!'
|
printf '\033[7m %s \033[m\n' 'warning: you ran sudo when you meant doas!'
|
||||||
sudo "$@"
|
sudo "$@"
|
||||||
}
|
}
|
||||||
maybesudo() { sudo "$@"; }
|
|
||||||
elif has doas; then
|
elif has doas; then
|
||||||
sudo() {
|
sudo() {
|
||||||
printf '\033[7m %s \033[m\n' 'warning: you ran doas when you meant sudo!'
|
printf '\033[7m %s \033[m\n' 'warning: you ran doas when you meant sudo!'
|
||||||
doas "$@"
|
doas "$@"
|
||||||
}
|
}
|
||||||
maybesudo() { doas "$@"; }
|
|
||||||
else
|
|
||||||
maybesudo() (__maybesudo "$@")
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ADDPATH() { ### @- append a directory to `$PATH` if it isn't already present.
|
ADDPATH() { ### @- append a directory to `$PATH` if it isn't already present.
|
||||||
|
|
12
sh/maybesudo
12
sh/maybesudo
|
@ -134,4 +134,16 @@ __maybesudo() { ### @maybesudo
|
||||||
}
|
}
|
||||||
|
|
||||||
maybesudo_()(__maybesudo "$@") # deprecated
|
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 "$@"
|
[ -n "${preload+-}" ] || __maybesudo "$@"
|
||||||
|
|
3
sh/pippy
3
sh/pippy
|
@ -11,8 +11,7 @@ pippy() { ### @-
|
||||||
~/work/automamba --pip install --upgrade --upgrade-strategy only-if-needed "$@"
|
~/work/automamba --pip install --upgrade --upgrade-strategy only-if-needed "$@"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
local sudo="$(has sudo || echo maybesudo_)"
|
maybesudo python3 -m pip install --upgrade --upgrade-strategy only-if-needed "$@"
|
||||||
"$sudo" python3 -m pip install --upgrade --upgrade-strategy only-if-needed "$@"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[ -n "${preload+-}" ] || . ~/sh/preload || exit 2
|
[ -n "${preload+-}" ] || . ~/sh/preload || exit 2
|
||||||
|
|
Loading…
Add table
Reference in a new issue