nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch from $SUDO to $ESCALATE

Browse Source 
Support both `doas` and `sudo`.
This commit is contained in:
ghost-420 2020-05-25 01:04:18 -07:00 committed by GitHub
parent 3614c24cf4
commit 706d1359c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/updater
View File

@ -8,8 +8,6 @@ AUTO_UPDATER_ENABLED=${1:-false}
DISABLE_TUI=${2:-false} DISABLE_TUI=${2:-false}
INIT=${3:-false} INIT=${3:-false}
SUDO=${CH_SUDO:-sudo}
set -e set -e
configfile="./scripts/updater-preferences" 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; } 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 # Update data
cwd="$(pwd)" 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 popd
echo -e "\n\033[1;34mCathook updated successfully\n\033[0m" echo -e "\n\033[1;34mCathook updated successfully\n\033[0m"
rm -f ${LOCKFILE} rm -f ${LOCKFILE}