1212
1313USER_TO_RUN_AS=${SUDO_USER:- $(whoami)}
1414
15- sudo -u $USER_TO_RUN_AS /usr/local/bin/$DESTINATION_BINARY_NAME stop > /dev/null 2>&1
15+ # Use /root if user is root, otherwise /Users/<username>
16+ if [ " $USER_TO_RUN_AS " = " root" ]; then
17+ USER_HOME=" /root"
18+ else
19+ USER_HOME=" /Users/$USER_TO_RUN_AS "
20+ fi
21+
22+ sudo -u " $USER_TO_RUN_AS " /usr/local/bin/$DESTINATION_BINARY_NAME stop > /dev/null 2>&1
1623rm /usr/local/bin/$DESTINATION_BINARY_NAME
1724
18- echo " Do you want to delete the '~ /$DATA_FOLDER_NAME ' data folder and file '~ /$CONFIGURATION_FILE_NAME '? (yes/no) "
25+ echo " Do you want to delete the '$USER_HOME /$DATA_FOLDER_NAME ' data folder and file '$USER_HOME /$CONFIGURATION_FILE_NAME '? (y/n) [default: n] "
1926read -r answer
2027
21- case " $answer " in
22- [yY][eE][sS]|[yY])
23- echo " Deleting cortex data folders..."
24- if [ -d " /Users/$USER_TO_RUN_AS /$DATA_FOLDER_NAME " ]; then
25- echo " Removing /Users/$USER_TO_RUN_AS /$DATA_FOLDER_NAME "
26- rm -rf " /Users/$USER_TO_RUN_AS /$DATA_FOLDER_NAME " > /dev/null 2>&1
27- fi
28- if [ -f " /Users/$USER_TO_RUN_AS /$CONFIGURATION_FILE_NAME " ]; then
29- echo " Removing /Users/$USER_TO_RUN_AS /$CONFIGURATION_FILE_NAME "
30- rm -f " /Users/$USER_TO_RUN_AS /$CONFIGURATION_FILE_NAME " > /dev/null 2>&1
31- fi
32- ;;
33- [nN][oO]|[nN])
34- echo " Keeping the 'cortex' data folders."
35- ;;
36- * )
37- echo " Invalid response. Please type 'yes' or 'no'."
38- ;;
39- esac
28+ # Default to 'no' if no input is provided
29+ while true ; do
30+ case " $answer " in
31+ [yY][eE][sS]|[yY])
32+ echo " Deleting cortex data folders..."
33+ if [ -d " $USER_HOME /$DATA_FOLDER_NAME " ]; then
34+ echo " Removing $USER_HOME /$DATA_FOLDER_NAME "
35+ rm -rf " $USER_HOME /$DATA_FOLDER_NAME " > /dev/null 2>&1
36+ fi
37+ if [ -f " $USER_HOME /$CONFIGURATION_FILE_NAME " ]; then
38+ echo " Removing $USER_HOME /$CONFIGURATION_FILE_NAME "
39+ rm -f " $USER_HOME /$CONFIGURATION_FILE_NAME " > /dev/null 2>&1
40+ fi
41+ break
42+ ;;
43+ [nN][oO]|[nN]|" " )
44+ echo " Keeping the 'cortex' data folders."
45+ break
46+ ;;
47+ * )
48+ echo " Invalid response. Please type 'yes', 'no', 'y', or 'n' (case-insensitive)."
49+ read -r answer
50+ ;;
51+ esac
52+ done
4053
41- rm /usr/local/bin/$UNINSTALLER_FILE_NAME
54+ rm /usr/local/bin/$UNINSTALLER_FILE_NAME
0 commit comments