Skip to content

Modified Uninstallation Behavior #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ExtremeFiretop merged 2 commits into from
Jan 20, 2025
Merged

Modified Uninstallation Behavior #393

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32c35d6
Modified Uninstallation Behavior
Martinski4GitHub Jan 20, 2025
705e6ec
Update MerlinAU.sh
Martinski4GitHub Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2025-Jan-18
# Last Modified: 2025-Jan-20
###################################################################
set -u

Expand Down Expand Up @@ -310,20 +310,28 @@ _WaitForEnterKey_()
read -rs EnterKEY ; echo
}

##----------------------------------##
## Added Martinski W. [2023-Nov-28] ##
##----------------------------------##
##-------------------------------------##
## Modified Martinski W. [2025-Jan-20] ##
##-------------------------------------##
_WaitForYESorNO_()
{
! "$isInteractive" && return 0
local promptStr
local retCode defltAnswer promptStr

if [ $# -eq 0 ] || [ -z "$1" ]
if [ $# -gt 0 ] && [ "$1" = "NO" ]
then retCode=1 ; defltAnswer="YES"
else retCode=0 ; defltAnswer="NO"
fi

! "$isInteractive" && return "$retCode"

if [ $# -eq 0 ] || [ -z "$1" ] || \
echo "$1" | grep -qE "^(YES|NO)$"
then promptStr=" [yY|nN]? "
else promptStr="$1 [yY|nN]? "
fi

printf "$promptStr" ; read -r YESorNO
[ -z "$YESorNO" ] && YESorNO="$defltAnswer"
if echo "$YESorNO" | grep -qE "^([Yy](es)?|YES)$"
then echo "OK" ; return 0
else echo "NO" ; return 1
Expand Down Expand Up @@ -8745,7 +8753,7 @@ _DoInstallation_()
}

##----------------------------------------##
## Modified by Martinski W. [2025-Jan-18] ##
## Modified by Martinski W. [2025-Jan-20] ##
##----------------------------------------##
_DoUnInstallation_()
{
Expand All @@ -8758,7 +8766,7 @@ _DoUnInstallation_()
local savedCFGPath="${SCRIPTS_PATH}/${SCRIPT_NAME}_CFG.SAVED.TXT"

printf "\n${BOLDct}Do you want to keep/save the $SCRIPT_NAME configuration file${NOct}"
if _WaitForYESorNO_
if _WaitForYESorNO_ NO
then
doSaveConfig=true
mv -f "$CONFIG_FILE" "$savedCFGPath"
Expand Down
Loading