diff --git a/package/Tautulli.nsi b/package/Tautulli.nsi index ff6e59f7..7f3464d7 100644 --- a/package/Tautulli.nsi +++ b/package/Tautulli.nsi @@ -218,9 +218,7 @@ Function .onInit Loop: ${nsProcess::FindProcess} ${MAIN_APP_EXE} $R0 StrCmp $R0 0 0 NoAbort - MessageBox MB_ABORTRETRYIGNORE|MB_ICONEXCLAMATION "${APP_NAME} is still running. Please shutdown ${APP_NAME} before continuing.$\r$\n$\r$\nIgnore will attempt to shutdown ${APP_NAME} for you." IDABORT End IDRETRY Loop - ${nsProcess::CloseProcess} ${MAIN_APP_EXE} $R0 - StrCmp $R0 0 0 NoAbort + MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "${APP_NAME} is still running. Please shutdown ${APP_NAME} before continuing." IDCANCEL End IDRETRY Loop Goto Loop End: Abort @@ -232,9 +230,7 @@ Function un.onInit Loop: ${nsProcess::FindProcess} ${MAIN_APP_EXE} $R0 StrCmp $R0 0 0 NoAbort - MessageBox MB_ABORTRETRYIGNORE|MB_ICONEXCLAMATION "${APP_NAME} is still running. Please shutdown ${APP_NAME} before continuing.$\r$\n$\r$\nIgnore will attempt to shutdown ${APP_NAME} for you." IDABORT End IDRETRY Loop - ${nsProcess::CloseProcess} ${MAIN_APP_EXE} $R0 - StrCmp $R0 0 0 NoAbort + MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "${APP_NAME} is still running. Please shutdown ${APP_NAME} before continuing." IDCANCEL End IDRETRY Loop Goto Loop End: Abort diff --git a/package/macos-scripts/preinstall b/package/macos-scripts/preinstall index 75ad6a71..e2599e19 100755 --- a/package/macos-scripts/preinstall +++ b/package/macos-scripts/preinstall @@ -3,16 +3,11 @@ function check_tautulli_running () { if pgrep -x "Tautulli" > /dev/null then - dialogText=`osascript -e 'set dialogText to button returned of (display dialog "Tautulli is still running. Please shutdown Tautulli before continuing." buttons {"Retry", "Shutdown Tautulli", "Abort"})'`; + dialogText=`osascript -e 'set dialogText to button returned of (display dialog "Tautulli is still running. Please shutdown Tautulli before continuing." buttons {"Retry", "Abort"})'`; if [[ $dialogText == 'Retry' ]] then check_tautulli_running; - elif [[ $dialogText == 'Shutdown Tautulli' ]] - then - pkill Tautulli - while pgrep Tautulli > /dev/null; do sleep 1; done - check_tautulli_running; elif [[ $dialogText == 'Abort' ]] then exit 1;