From c1b67bd580b67d8cc130f539ba76f1272a0c1f4a Mon Sep 17 00:00:00 2001
From: nikk gitanes <tsynik@gmail.com>
Date: Sat, 23 Dec 2023 14:11:14 +0300
Subject: [PATCH] fix uninstall on MacOS

---
 README.md               |  2 +-
 installTorrServerMac.sh | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 2d9ea9f..8b7b69e 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ curl -s https://raw.githubusercontent.com/YouROK/TorrServer/master/installTorrSe
 Run in Terminal.app
 
 ```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>
diff --git a/installTorrServerMac.sh b/installTorrServerMac.sh
index 93ccb0b..9d8f039 100755
--- a/installTorrServerMac.sh
+++ b/installTorrServerMac.sh
@@ -32,10 +32,10 @@ function killRunning() {
 }
 
 function cleanup() {
-  sudo rm -f /Library/LaunchAgents/*torrserver* 1>/dev/null 2>&1
-  sudo rm -f /Library/LaunchDaemons/*torrserver* 1>/dev/null 2>&1
-  sudo rm -f $HOME/Library/LaunchAgents/*torrserver* 1>/dev/null 2>&1
-  sudo rm -f $HOME/Library/LaunchDaemons/*torrserver* 1>/dev/null 2>&1
+  sudo rm -f /Library/LaunchAgents/*torrserver*
+  sudo rm -f /Library/LaunchDaemons/*torrserver*
+  sudo rm -f $HOME/Library/LaunchAgents/*torrserver*
+  sudo rm -f $HOME/Library/LaunchDaemons/*torrserver*
   killRunning
 }
 
@@ -54,7 +54,6 @@ function uninstall() {
     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
-  read answer_del
   if [ "$answer_del" != "${answer_del#[YyДд]}" ]; then
     cleanup
     sudo rm -rf $dirInstall
@@ -211,7 +210,7 @@ EOF
     [[ $lang == "en" ]] && echo " Use user \"$isAuthUser\" with password \"$isAuthPass\" for web auth" || echo " Для авторизации введите пользователя $isAuthUser с паролем $isAuthPass"
     echo ""
   fi
-  sleep 60
+  sleep 30
 }
 
 while true; do