Change rootcheck

This commit is contained in:
Case Duckworth 2019-07-15 21:43:12 -05:00
parent 3c729dd338
commit 4b2609a1ed
1 changed files with 23 additions and 17 deletions

40
vpm
View File

@ -150,8 +150,14 @@ version () {
# check if we have UID 0, exit otherwise
rootcheck () {
if [[ $EUID -gt 0 ]]; then
msg "ERROR: $progname: This operation needs super-user privileges. Exiting."
exit 255
msg "$progname: This operation needs super-user privileges."
read -p "Elevate (Y/n)? " yn
case "$yn" in
n*|N*) exit 255 ;;
*) SUDO=sudo ;;
esac
else
SUDO=''
fi
}
@ -380,7 +386,7 @@ case "$arg" in
setalternative|setalternatives|sa)
shift
rootcheck
xbps-alternatives -s "$@"
$SUDO xbps-alternatives -s "$@"
ret=$?
rmsg "$ret" "xbps-alternatives return code: $ret (xbps-alternatives -s $@)"
;;
@ -407,11 +413,11 @@ case "$arg" in
rootcheck
for repo in "$@"; do
msg "Adding repository: $repo"
xbps-install "$1"
$SUDO xbps-install "$1"
ret=$?
rmsg "$ret" "[xbps-install $arg] return code: $ret"
msg "Synchronizing remote repository data (xbps-install -S): "
xbps-install -S
$SUDO xbps-install -S
ret=$?
rmsg "$ret" "[xbps-install -S] return code: $ret"
shift
@ -422,7 +428,7 @@ case "$arg" in
shift
rootcheck
msg "Synchronizing remote repository data: (xbps-install -S):"
xbps-install -S
$SUDO xbps-install -S
ret=$?
rmsg "$ret" "[xbps-install -S] return code: $ret"
;;
@ -435,7 +441,7 @@ case "$arg" in
exit 1
fi
msg "Installing packages: $@ (xbps-install -S $@) ..."
xbps-install -S "$@"
$SUDO xbps-install -S "$@"
ret=$?
rmsg "$ret" "[xbps-install -S $@] return code: $ret"
;;
@ -448,7 +454,7 @@ case "$arg" in
exit 1
fi
msg "Installing packages: $@ (xbps-install -S $@) ..."
xbps-install -y -S "$@"
$SUDO xbps-install -y -S "$@"
ret=$?
rmsg "$ret" "[xbps-install -S $@] return code: $ret"
;;
@ -467,11 +473,11 @@ case "$arg" in
for arg in "${args[@]}"; do
let count=count+1
msg "Installing package: $arg (xbps-install -S $arg) ..."
xbps-install -S "$arg"
$SUDO xbps-install -S "$arg"
ret=$?
rmsg "$ret" "[xbps-install -S $arg] return code: $ret"
msg "installing devel package (${arg}-devel):"
xbps-install -S "${arg}-devel"
$SUDO xbps-install -S "${arg}-devel"
ret=$?
rmsg "$ret" "[xbps-install -S ${arg}-devel] return code: $ret"
done
@ -481,7 +487,7 @@ case "$arg" in
shift
rootcheck
msg "Force-Installing Package(s): $@ (xbps-install -Sf $@)"
xbps-install -Sf "$@"
$SUDO xbps-install -Sf "$@"
ret=$?
rmsg "$ret" "[xbps-install -Sf ${@}] return code: $ret"
;;
@ -490,7 +496,7 @@ case "$arg" in
shift
rootcheck
msg "Removing package(s): $@ (xbps-remove -v $@)"
xbps-remove -v "$@"
$SUDO xbps-remove -v "$@"
ret=$?
rmsg "$ret" "[xbps-remove -v ${@}] return code: $ret"
;;
@ -499,7 +505,7 @@ case "$arg" in
shift
rootcheck
msg "Removing package(s) recursively: $@ (xbps-remove -v -R $@)"
xbps-remove -v -R "$@"
$SUDO xbps-remove -v -R "$@"
ret=$?
rmsg "$ret" "[xbps-remove -v -R ${@}] return code: $ret"
;;
@ -508,7 +514,7 @@ case "$arg" in
shift
rootcheck
msg "reconfigure: Re-configuring package(s) (xbps-reconfigure -v $@):"
xbps-reconfigure -v "$@"
$SUDO xbps-reconfigure -v "$@"
ret=$?
rmsg "$ret" "[xbps-reconfigure -v ${@}] return code: $ret"
;;
@ -517,7 +523,7 @@ case "$arg" in
shift
rootcheck
msg "autoremove: Removing orphaned packages (xbps-remove -v -o)"
xbps-remove -v -o
$SUDO xbps-remove -v -o
ret=$?
rmsg "$ret" "[xbps-remove -v -o] return code: $ret"
;;
@ -526,7 +532,7 @@ case "$arg" in
shift
rootcheck
msg "Running system update (xbps-install -Suv)"
xbps-install -Suv
$SUDO xbps-install -Suv
ret=$?
rmsg "$ret" "[xbps-install -Suv] return code: $ret"
;;
@ -543,7 +549,7 @@ case "$arg" in
msg "Cleaning up packages (will remove orphaned packages) (xbps-remove -v -O $@)"
shift
rootcheck
xbps-remove -v -O "$@"
$SUDO xbps-remove -v -O "$@"
ret=$?
rmsg "$ret" "[xbps-remove -v -O $@] return code: $ret"
;;