From 8e95abf326d709afb83cf47c96b88545865bd365 Mon Sep 17 00:00:00 2001
From: Martin Paljak <martin@martinpaljak.net>
Date: Fri, 1 Mar 2013 10:02:36 +0200
Subject: [PATCH] macosx: make the opensc-uninstall script better at removing
 all files.

---
 MacOSX/opensc-uninstall | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/MacOSX/opensc-uninstall b/MacOSX/opensc-uninstall
index b40e9159..bd87839f 100755
--- a/MacOSX/opensc-uninstall
+++ b/MacOSX/opensc-uninstall
@@ -6,20 +6,23 @@ if [ "$(id -u)" != "0" ]; then
    exit 1
 fi
 
+# Remove symlinks to commands
+for file in /Library/OpenSC/bin/*; do
+	test -L "/usr/local/bin/$(basename $file)" && rm -f "/usr/local/bin/$(basename $file)"
+done
+
+# Remove symlink for pkcs11
+test -L /usr/lib/opensc-pkcs11.so && rm -f /usr/lib/opensc-pkcs11.so
+
+# Remove installed files
 rm -rf /Library/OpenSC
 rm -rf /System/Library/Security/tokend/OpenSC.tokend
 
-for file in /usr/lib/opensc-pkcs11.so /usr/local/bin/cardos-tool /usr/local/bin/cryptoflex-tool /usr/local/bin/eidenv /usr/local/bin/netkey-tool /usr/local/bin/opensc-explorer /usr/local/bin/opensc-tool /usr/local/bin/piv-tool /usr/local/bin/pkcs11-tool /usr/local/bin/pkcs15-crypt /usr/local/bin/pkcs15-init /usr/local/bin/pkcs15-tool /usr/local/bin/rutoken-tool /usr/local/bin/westcos-tool; do
-	test -L $file && rm -f $file
-done
-rm -f /usr/local/bin/opensc-uninstall
-
-# delete receipts on 10.6
+# delete receipts on 10.6+
 for file in /var/db/receipts/org.opensc-project.mac.bom /var/db/receipts/org.opensc-project.mac.plist; do
 	test -f $file && rm -f $file
 done
 
-# delete receipts on 10.5
-test -d /Library/Receipts/OpenSC-10.5.pkg && rm -rf /Library/Receipts/OpenSC-10.5.pkg
-
+# remove this script
+rm -f /usr/local/bin/opensc-uninstall
 echo "OpenSC has been removed from your system. See you again!"