michael/MacAdmin
1
0
Fork 0
mirror of https://github.com/MLBZ521/MacAdmin.git synced 2026-02-03 05:53:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

v1.1.0 = Fixed issue with user preferences logic

Browse Source 
+ Fixed an issue with the logic regarding the user preferences (they were always being preserved)
+ Restructured the removal functions to be a little more clear
+ A few other minor tweaks, including redirecting `ls` stderr to null
This commit is contained in:
Zack T
2019-06-26 16:48:12 -07:00
parent 7c774da476
commit 88b91f7168
1 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
Software/uninstall_Spirion.sh
View File

@@ -3,7 +3,7 @@
###################################################################################################
# Script Name: uninstall_Spirion.sh
# By: Zack Thompson / Created: 6/3/2019
# Version: 1.0.0 / Updated: 6/3/2019 / By: ZT
# Version: 1.1.0 / Updated: 6/26/2019 / By: ZT
#
# Description: This script uninstalls Spirion and Identity Finder.
#
@@ -21,10 +21,10 @@
shopt -s checkhash cmdhist nullglob;
runSilently=0;
# answerYes=0;
# answerNo=0;
askForPassword=0;
runSilently=0
# answerYes=0
# answerNo=0
askForPassword=0
case "${4}" in
Yes|yes|YES|Y|y)
@@ -282,7 +282,8 @@ DeleteUsersShared () {
RemoveFileOrDirectory "$UsersSharedPath/TasksMonitor";
RemoveFileOrDirectory "$UsersSharedPath/Temp";
lsOutput=$(ls "$UsersSharedPath");
# lsOutput=$(ls "$UsersSharedPath");
lsOutput=$(ls "$UsersSharedPath" 2> /dev/null )
if [ -n "$lsOutput" ]; then
echo "$UsersSharedPath is not empty."
@@ -327,7 +328,8 @@ DeleteEverythingExceptLicensesActivationAndPrefs () {
RemoveFileOrDirectory "$1/logs";
RemoveFileOrDirectory "$1/logtime.dat";
lsOutput=$(ls "$1");
# lsOutput=$(ls "$1");
lsOutput=$( ls "$1" 2> /dev/null )
if [ -n "$lsOutput" ]; then
echo "$1 is not empty."
@@ -432,30 +434,47 @@ if (($runSilently==1)); then
fi
else
echo "Starting $IDFBaseName/$SpirionBaseName $0 script at $(date)";
if (($answerYes==0)); then
read -a answer -p "Preserve user prefs? (Yes/No)";
theAnswer=${answer[0]};
else
theAnswer='y';
fi
# if (($answerYes==0)); then
# read -a answer -p "Preserve user prefs? (Yes/No)";
# theAnswer=${answer[0]};
# else
# theAnswer='y';
# fi
case "$theAnswer" in
(Yes|yes|YES|Y|y)
UnloadAndDeleteLaunchAgents;
DeleteApps "$IDFAppName" "$IDFPKGBuilderName";
DeleteApps "$SpirionAppName" "$SpirionPKGBuilderName";
DeleteEverythingExceptLicensesActivationAndPrefs "$IDFUsersAppSupportFullPath" "$IDFUsersAppSupportBase";
DeleteEverythingExceptLicensesActivationAndPrefs "$SpirionUsersAppSupportFullPath" "$SpirionUsersAppSupportBase";
CleanPackageMakerDB;;
(No|no|NO|N|n)
UnloadAndDeleteLaunchAgents;
DeleteApps "$IDFAppName" "$IDFPKGBuilderName";
DeleteApps "$SpirionAppName" "$SpirionPKGBuilderName";
DeleteEverythingExceptLicensesActivationAndPrefs "$IDFUsersAppSupportFullPath" "$IDFUsersAppSupportBase";
DeleteEverythingExceptLicensesActivationAndPrefs "$SpirionUsersAppSupportFullPath" "$SpirionUsersAppSupportBase";
CleanPackageMakerDB;
DeleteLicensesActivationAndPrefs;;
esac;
# case "$theAnswer" in
# (Yes|yes|YES|Y|y)
# UnloadAndDeleteLaunchAgents;
# DeleteApps "$IDFAppName" "$IDFPKGBuilderName";
# DeleteApps "$SpirionAppName" "$SpirionPKGBuilderName";
# DeleteEverythingExceptLicensesActivationAndPrefs "$IDFUsersAppSupportFullPath" "$IDFUsersAppSupportBase";
# DeleteEverythingExceptLicensesActivationAndPrefs "$SpirionUsersAppSupportFullPath" "$SpirionUsersAppSupportBase";
# CleanPackageMakerDB;;
# (No|no|NO|N|n)
# UnloadAndDeleteLaunchAgents;
# DeleteApps "$IDFAppName" "$IDFPKGBuilderName";
# DeleteApps "$SpirionAppName" "$SpirionPKGBuilderName";
# DeleteEverythingExceptLicensesActivationAndPrefs "$IDFUsersAppSupportFullPath" "$IDFUsersAppSupportBase";
# DeleteEverythingExceptLicensesActivationAndPrefs "$SpirionUsersAppSupportFullPath" "$SpirionUsersAppSupportBase";
# CleanPackageMakerDB;
# DeleteLicensesActivationAndPrefs;;
# esac;
UnloadAndDeleteLaunchAgents
DeleteApps "${IDFAppName}" "${IDFPKGBuilderName}"
DeleteApps "${SpirionAppName}" "${SpirionPKGBuilderName}"
DeleteEverythingExceptLicensesActivationAndPrefs "$IDFUsersAppSupportFullPath" "$IDFUsersAppSupportBase"
DeleteEverythingExceptLicensesActivationAndPrefs "$SpirionUsersAppSupportFullPath" "$SpirionUsersAppSupportBase"
CleanPackageMakerDB
if [[ $answerYes == 0 ]]; then
echo "Deleting the user preferences..."
DeleteLicensesActivationAndPrefs
elif [[ $answerYes == 1 ]]; then
echo "Preserving the user preferences..."
else
echo "*** WARNING: Did not specify whether to preserve the user preferences... ***"
echo "Preserving the user preferences..."
fi
echo "Completed $IDFBaseName/$SpirionBaseName $0 script at $(date).";
fi