diff --git a/install.sh b/install.sh index 35e561b..a9b87d2 100644 --- a/install.sh +++ b/install.sh @@ -2,7 +2,6 @@ CURRENT_USER="${SUDO_USER}" SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )" -USER_HOME=$(bash -c "cd ~$(printf %q $CURRENT_USER) && pwd") HOST="$( hostname )" LOCALES=(en fr es ru pt de it) @@ -91,7 +90,7 @@ Description=Spyguard frontend service [Service] Type=simple -ExecStart=$USER_HOME/SpyGuard-venv/bin/python3 /usr/share/spyguard/server/frontend/main.py +ExecStart=/home/${SUDO_USER}/SpyGuard-venv/bin/python3 /usr/share/spyguard/server/frontend/main.py Restart=on-abort KillMode=process @@ -106,7 +105,7 @@ Description=Spyguard backend service [Service] Type=simple -ExecStart=$USER_HOME/SpyGuard-venv/bin/python3 /usr/share/spyguard/server/backend/main.py +ExecStart=/home/${SUDO_USER}/SpyGuard-venv/bin/python3 /usr/share/spyguard/server/backend/main.py Restart=on-abort KillMode=process @@ -123,7 +122,7 @@ After=network-online.target [Service] Type=simple -ExecStart=$USER_HOME/SpyGuard-venv/bin/python3 /usr/share/spyguard/server/backend/watchers.py +ExecStart=/home/${SUDO_USER}/SpyGuard-venv/bin/python3 /usr/share/spyguard/server/backend/watchers.py Restart=on-abort KillMode=process @@ -186,7 +185,7 @@ check_dependencies() { fi done echo -e "\e[39m[+] Install Python packages...\e[39m" - python3 -m venv $USER_HOME/SpyGuard-venv && source $USER_HOME/SpyGuard-venv/bin/activate && python3 -m pip install -r "$SCRIPT_PATH/assets/requirements.txt" + python3 -m venv /home/${SUDO_USER}/SpyGuard-venv && source /home/${SUDO_USER}/SpyGuard-venv/bin/activate && python3 -m pip install -r "$SCRIPT_PATH/assets/requirements.txt" } get_version() { diff --git a/uninstall.sh b/uninstall.sh index 8f04401..a4d42bb 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -2,6 +2,7 @@ delete_folder(){ echo "[+] Deleting Spyguard folders" rm -rf /usr/share/spyguard/ + rm -rf /home/${SUDO_USER}/SpyGuard-venv } delete_services(){