From 882cbe3d756a34d23a12ec9181a662b3d928f4d5 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Thu, 19 Nov 2020 09:11:16 +0200
Subject: [PATCH] Add uninstaller

IB-6271

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 make.sh               |  8 +++---
 open-eid-uninstall.sh | 60 ++++++++++++++++++++++++++++++++++++++++++
 uninstall.sh          | 61 -------------------------------------------
 3 files changed, 64 insertions(+), 65 deletions(-)
 create mode 100755 open-eid-uninstall.sh
 delete mode 100755 uninstall.sh

diff --git a/make.sh b/make.sh
index e74928e..dce4eed 100644
--- a/make.sh
+++ b/make.sh
@@ -19,7 +19,8 @@ else
     ARGS=(--version $1 --sign "Developer ID Installer: $2")
 fi
 
-mkdir -p root packages
+mkdir -p root/usr/local/bin packages
+cp ${SOURCE}/open-eid-uninstall.sh root/usr/local/bin
 
 pkgbuild "${ARGS[@]}" --root root --scripts scripts --id ee.ria.open-eid \
     packages/open-eid.pkg
@@ -29,13 +30,12 @@ productbuild "${ARGS[@]}" --distribution ${SOURCE}/plugins.xml \
     --package-path packages/ --resources . Open-EID-plugins_$1.pkg
 
 cp ${SOURCE}/DS_Store ${tmpdir}/.DS_Store
-cp Open-EID.pkg background.png ${SOURCE}/uninstall.sh ${tmpdir}
+cp Open-EID.pkg background.png ${tmpdir}
 setfile -a E ${tmpdir}/Open-EID.pkg
 setfile -a V ${tmpdir}/background.png
 hdiutil create Open-EID_$1.dmg -ov -volname Open-EID -srcfolder ${tmpdir}
 
-rmdir root
-rm -rf .DS_Store background.png Open-EID.pkg License.txt scripts ${tmpdir}
+rm -rf root .DS_Store background.png Open-EID.pkg License.txt scripts ${tmpdir}
 
 if [ ! -z "$2" ]
 then
diff --git a/open-eid-uninstall.sh b/open-eid-uninstall.sh
new file mode 100755
index 0000000..f1a5843
--- /dev/null
+++ b/open-eid-uninstall.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+if [ "$(id -u)" != "0" ]; then
+   echo "This script must be run as root:"
+   echo ""
+   echo "sudo /usr/local/bin/open-eid-uninstall"
+   exit 1
+fi
+
+echo 'Removing Updater'
+
+for user in $(dscl . list /Users |grep -v -e '^_.*' -e Guest -e root -e daemon -e nobody); do
+    -u "${user}" /Library/PreferencePanes/id-updater.prefPane/Contents/Resources/id-updater-helper -remove
+done
+rm -rf /Library/PreferencePanes/id-updater.prefPane
+
+echo 'Removing browser plug-ins and extensions'
+rm -rf \
+    /Library/Google/Chrome/NativeMessagingHosts/chrome-token-signing.app \
+    /Library/Google/Chrome/NativeMessagingHosts/ee.ria.esteid.json \
+    /Library/Application\ Support/Google/Chrome/External\ Extensions/ckjefchnfjhjfedoccjbhjpbncimppeg.json \
+    /Library/Application\ Support/Mozilla/NativeMessagingHosts/ee.ria.esteid.json \
+    /Library/Application\ Support/Mozilla/PKCS11Modules/onepinopenscpkcs11.json \
+    /Library/Application\ Support/Mozilla/PKCS11Modules/idemiaawppkcs11.json \
+    /Library/Application\ Support/Mozilla/Extensions/\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}/\{443830f0-1fff-4f9a-aa1e-444bafbc7319\}.xpi \
+    /Library/Application\ Support/Mozilla/Extensions/\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}/\{02274e0c-d135-45f0-8a9c-32b35110e10d\}.xpi \
+    /Applications/Utilities/TokenSigningSafariHelper.app
+base_ver="10.15.99"
+if [ $(echo -e $base_ver"\n"$(sw_vers -productVersion) | sort -V | tail -1) == "$base_ver" ]; then 
+    profiles remove --identifier ee.ria.chrome-token-signing
+fi
+osascript -e 'tell application "System Events" to delete login item "TokenSigningSafariHelper"'
+PLIST=/Library/Preferences/org.mozilla.firefox.plist
+defaults write ${PLIST} ExtensionSettings -dict-add "'{02274e0c-d135-45f0-8a9c-32b35110e10d}'" "{ 'installation_mode' = 'blocked'; }"
+defaults write ${PLIST} ExtensionSettings -dict-add "'{443830f0-1fff-4f9a-aa1e-444bafbc7319}'" "{ 'installation_mode' = 'blocked'; }"
+
+echo 'Removing Drivers'
+/usr/local/bin/opensc-uninstall
+rm -rf /Library/Security/tokend/EstEID.tokend
+rm -rf /Applications/Utilities/EstEIDTokenApp.app
+
+echo 'Cleaning up'
+pkgutil --forget ee.ria.open-eid
+pkgutil --forget ee.ria.ID-updater
+pkgutil --forget ee.ria.chrome-token-signing
+pkgutil --forget ee.ria.token-signing-chrome
+pkgutil --forget ee.ria.token-signing-firefox
+pkgutil --forget ee.ria.token-signing-chrome-policy
+pkgutil --forget ee.ria.chrome-token-signing-policy
+pkgutil --forget ee.ria.safari-token-signing
+pkgutil --forget ee.ria.firefox-pkcs11-loader
+pkgutil --forget ee.ria.esteid-tokend
+pkgutil --forget ee.ria.esteid-ctk-tokend
+pkgutil --forget org.opensc-project.mac
+rm -rf /Library/Preferences/ee.ria.*
+
+rm -rf /Applications/Utilities/open-eid-uninstall.app
+rm /usr/local/bin/open-eid-uninstall.sh
+
+echo 'Uninstall done!'
diff --git a/uninstall.sh b/uninstall.sh
deleted file mode 100755
index 42cfac9..0000000
--- a/uninstall.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# UNINSTALLS Open-EID SOFTWARE
-
-function remove_all {
-    echo 'Removing Updater'
-    for user in $(dscl . list /Users |grep -v -e '^_.*' -e Guest -e root -e daemon -e nobody); do
-        sudo -u "${user}" /Library/PreferencePanes/id-updater.prefPane/Contents/Resources/id-updater-helper -remove
-    done
-    sudo rm -rf /Library/PreferencePanes/id-updater.prefPane
-
-    echo 'Removing browser plug-ins and extensions'
-    sudo rm -rf \
-        /Library/Google/Chrome/NativeMessagingHosts/chrome-token-signing.app \
-        /Library/Google/Chrome/NativeMessagingHosts/ee.ria.esteid.json \
-        /Library/Application\ Support/Google/Chrome/External\ Extensions/ckjefchnfjhjfedoccjbhjpbncimppeg.json \
-        /Library/Application\ Support/Mozilla/NativeMessagingHosts/ee.ria.esteid.json \
-        /Library/Application\ Support/Mozilla/PKCS11Modules/onepinopenscpkcs11.json \
-        /Library/Application\ Support/Mozilla/PKCS11Modules/idemiaawppkcs11.json \
-        /Library/Application\ Support/Mozilla/Extensions/\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}/\{443830f0-1fff-4f9a-aa1e-444bafbc7319\}.xpi \
-        /Library/Application\ Support/Mozilla/Extensions/\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}/\{02274e0c-d135-45f0-8a9c-32b35110e10d\}.xpi \
-        /Applications/Utilities/TokenSigningSafariHelper.app
-    base_ver="10.15.99"
-    if [ $(echo -e $base_ver"\n"$(sw_vers -productVersion) | sort -V | tail -1) == "$base_ver" ]; then 
-        sudo profiles remove --identifier ee.ria.chrome-token-signing
-    fi
-    osascript -e 'tell application "System Events" to delete login item "TokenSigningSafariHelper"'
-    PLIST=/Library/Preferences/org.mozilla.firefox.plist
-    sudo defaults write ${PLIST} ExtensionSettings -dict-add "'{02274e0c-d135-45f0-8a9c-32b35110e10d}'" "{ 'installation_mode' = 'blocked'; }"
-    sudo defaults write ${PLIST} ExtensionSettings -dict-add "'{443830f0-1fff-4f9a-aa1e-444bafbc7319}'" "{ 'installation_mode' = 'blocked'; }"
-
-    echo 'Removing Drivers'
-    sudo /usr/local/bin/opensc-uninstall
-    sudo rm -rf /Library/Security/tokend/EstEID.tokend
-    sudo rm -rf /Applications/Utilities/EstEIDTokenApp.app
-
-    echo 'Cleaning up'
-    sudo pkgutil --forget ee.ria.open-eid
-    sudo pkgutil --forget ee.ria.ID-updater
-    sudo pkgutil --forget ee.ria.chrome-token-signing
-    sudo pkgutil --forget ee.ria.token-signing-chrome
-    sudo pkgutil --forget ee.ria.token-signing-firefox
-    sudo pkgutil --forget ee.ria.token-signing-chrome-policy
-    sudo pkgutil --forget ee.ria.chrome-token-signing-policy
-    sudo pkgutil --forget ee.ria.safari-token-signing
-    sudo pkgutil --forget ee.ria.firefox-pkcs11-loader
-    sudo pkgutil --forget ee.ria.esteid-tokend
-    sudo pkgutil --forget ee.ria.esteid-ctk-tokend
-    sudo pkgutil --forget org.opensc-project.mac
-    sudo rm -rf /Library/Preferences/ee.ria.*
-
-    echo 'Uninstall done!'
-}
-
-read -n1 -p 'Uninstall Open-EID Software? [y/N] '
-echo
-
-case $REPLY in
-    y ) remove_all ;;
-    * ) exit 0 ;;
-esac