fix uninstall on MacOS

This commit is contained in:
nikk gitanes
2023-12-23 14:11:14 +03:00
parent b439f21958
commit c1b67bd580
2 changed files with 6 additions and 7 deletions

View File

@@ -65,7 +65,7 @@ curl -s https://raw.githubusercontent.com/YouROK/TorrServer/master/installTorrSe
Run in Terminal.app Run in Terminal.app
```bash ```bash
curl -s https://raw.githubusercontent.com/YouROK/TorrServer/master/installTorrServerMac.sh -o installTorrserverMac.sh && chmod 755 installTorrServerMac.sh && sudo ./installTorrServerMac.sh curl -s https://raw.githubusercontent.com/YouROK/TorrServer/master/installTorrServerMac.sh -o installTorrserverMac.sh && chmod 755 installTorrServerMac.sh && sudo bash ./installTorrServerMac.sh
``` ```
Alternative install script for Intel Macs: <https://github.com/dancheskus/TorrServerMacInstaller> Alternative install script for Intel Macs: <https://github.com/dancheskus/TorrServerMacInstaller>

View File

@@ -32,10 +32,10 @@ function killRunning() {
} }
function cleanup() { function cleanup() {
sudo rm -f /Library/LaunchAgents/*torrserver* 1>/dev/null 2>&1 sudo rm -f /Library/LaunchAgents/*torrserver*
sudo rm -f /Library/LaunchDaemons/*torrserver* 1>/dev/null 2>&1 sudo rm -f /Library/LaunchDaemons/*torrserver*
sudo rm -f $HOME/Library/LaunchAgents/*torrserver* 1>/dev/null 2>&1 sudo rm -f $HOME/Library/LaunchAgents/*torrserver*
sudo rm -f $HOME/Library/LaunchDaemons/*torrserver* 1>/dev/null 2>&1 sudo rm -f $HOME/Library/LaunchDaemons/*torrserver*
killRunning killRunning
} }
@@ -54,7 +54,6 @@ function uninstall() {
echo "" echo ""
} }
[[ $lang == "en" ]] && read -p ' Are you shure you want to delete TorrServer? (Yes/No) ' answer_del </dev/tty || read -p ' Вы уверены что хотите удалить программу? (Да/Нет) ' answer_del </dev/tty [[ $lang == "en" ]] && read -p ' Are you shure you want to delete TorrServer? (Yes/No) ' answer_del </dev/tty || read -p ' Вы уверены что хотите удалить программу? (Да/Нет) ' answer_del </dev/tty
read answer_del
if [ "$answer_del" != "${answer_del#[YyДд]}" ]; then if [ "$answer_del" != "${answer_del#[YyДд]}" ]; then
cleanup cleanup
sudo rm -rf $dirInstall sudo rm -rf $dirInstall
@@ -211,7 +210,7 @@ EOF
[[ $lang == "en" ]] && echo " Use user \"$isAuthUser\" with password \"$isAuthPass\" for web auth" || echo " Для авторизации введите пользователя $isAuthUser с паролем $isAuthPass" [[ $lang == "en" ]] && echo " Use user \"$isAuthUser\" with password \"$isAuthPass\" for web auth" || echo " Для авторизации введите пользователя $isAuthUser с паролем $isAuthPass"
echo "" echo ""
fi fi
sleep 60 sleep 30
} }
while true; do while true; do