From 706d1359c1aff05ef35f000fddaf09f52f5f5fab Mon Sep 17 00:00:00 2001 From: ghost-420 <29991266+ghost-420@users.noreply.github.com> Date: Mon, 25 May 2020 01:04:18 -0700 Subject: [PATCH] Switch from $SUDO to $ESCALATE Support both `doas` and `sudo`. --- scripts/updater | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/updater b/scripts/updater index 63ea8982..a408ac54 100755 --- a/scripts/updater +++ b/scripts/updater @@ -8,8 +8,6 @@ AUTO_UPDATER_ENABLED=${1:-false} DISABLE_TUI=${2:-false} INIT=${3:-false} -SUDO=${CH_SUDO:-sudo} - set -e configfile="./scripts/updater-preferences" @@ -152,7 +150,7 @@ function performupdate() { pushd build && cmake .. && cmake --build . --target cathook -- -j$proccount || { echo -e "\033[1;31m \n \nFailed to compile cathook\n\033[0m"; exit 1; } # Update data cwd="$(pwd)" - cmake --build . --target data || { echo -e "\033[1;31m\nFailed to update /opt/cathook/data directory! Trying with root rights!\n\033[0m"; $SUDO bash -c "cd \"$cwd\"; cmake --build . --target data" || { echo -e "\033[1;31m\nFailed to update /opt/cathook/data directory\n\033[0m"; exit 1; } } + cmake --build . --target data || { echo -e "\033[1;31m\nFailed to update /opt/cathook/data directory! Trying with root rights!\n\033[0m"; $ESCALATE bash -c "cd \"$cwd\"; cmake --build . --target data" || { echo -e "\033[1;31m\nFailed to update /opt/cathook/data directory\n\033[0m"; exit 1; } } popd echo -e "\n\033[1;34mCathook updated successfully\n\033[0m" rm -f ${LOCKFILE}