From: Ben Soares Date: Thu, 20 Jun 2019 11:53:57 +0000 (+0100) Subject: JAL-3323 Improved macOS Old Jalview Uninstaller X-Git-Tag: Release_2_11_0~3^2~1^2~13 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=862f3e6bae01460b08acfd9b1d9d1a54e76be731;hp=75dda4687afe1896295a1c3250df66a1004a330e JAL-3323 Improved macOS Old Jalview Uninstaller --- diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist b/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist index 06399cf..649770d 100644 --- a/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist +++ b/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist @@ -11,11 +11,11 @@ CFBundleIconFile applet CFBundleIdentifier - com.apple.ScriptEditor.id.Uninstall-Old-Jalview--optional + com.apple.ScriptEditor.id.Uninstall-Old-Jalview CFBundleInfoDictionaryVersion 6.0 CFBundleName - Uninstall Old Jalview (optional) + Uninstall Old Jalview CFBundlePackageType APPL CFBundleShortVersionString @@ -29,6 +29,28 @@ LSRequiresCarbon + NSAppleEventsUsageDescription + This script needs to control other applications to run. + NSAppleMusicUsageDescription + This script needs access to your music to run. + NSCalendarsUsageDescription + This script needs access to your calendars to run. + NSCameraUsageDescription + This script needs access to your camera to run. + NSContactsUsageDescription + This script needs access to your contacts to run. + NSHomeKitUsageDescription + This script needs access to your HomeKit Home to run. + NSMicrophoneUsageDescription + This script needs access to your microphone to run. + NSPhotoLibraryUsageDescription + This script needs access to your photos to run. + NSRemindersUsageDescription + This script needs access to your reminders to run. + NSSiriUsageDescription + This script needs access to Siri to run. + NSSystemAdministrationUsageDescription + This script needs access to administer this system to run. WindowState bundleDividerCollapsed @@ -36,7 +58,7 @@ bundlePositionOfDivider 0.0 dividerCollapsed - + eventLogLevel 2 name @@ -44,9 +66,9 @@ positionOfDivider 421 savedFrame - 20 1180 700 672 0 0 3360 1867 + 272 342 1754 910 0 0 3360 1867 selectedTab - description + result diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet b/utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet index 05e9c35..1ace4ca 100755 Binary files a/utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet and b/utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet differ diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt index 7afbebc..3147d89 100644 Binary files a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt and b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt differ diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc index cf9920e..8e05928 100644 Binary files a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc and b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc differ diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf index 76ac711..5f23fc5 100644 --- a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf +++ b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 +{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500 {\fonttbl} {\colortbl;\red255\green255\blue255;} {\*\expandedcolortbl;;} diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources b/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources deleted file mode 100644 index 9e97319..0000000 --- a/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources +++ /dev/null @@ -1,177 +0,0 @@ - - - - - files - - Resources/Scripts/main.scpt - - fqUypmAyNT7kgykBjNqtdjMM1Mg= - - Resources/applet.icns - - vIRz6m6+ZxDNfi4iTsXj5rdcZUA= - - Resources/applet.rsrc - - aTN+E9yPFzj2wRwcmefcTGGpQYM= - - Resources/description.rtfd/TXT.rtf - - O79gUM5bdy3TK5k10nzhees3tLA= - - - files2 - - Resources/Scripts/main.scpt - - hash - - fqUypmAyNT7kgykBjNqtdjMM1Mg= - - hash2 - - EQiIOT1XOBWGSwXZlfTXIrxNy+61mjRDze6gR+e3c2U= - - - Resources/applet.icns - - hash - - vIRz6m6+ZxDNfi4iTsXj5rdcZUA= - - hash2 - - D7gig1wJlOzR/Iy+y6TESLN0j/cIpjThUyO1pj5fZEc= - - - Resources/applet.rsrc - - hash - - aTN+E9yPFzj2wRwcmefcTGGpQYM= - - hash2 - - fQhBZ0v2JeXFde/OYcgUVYOfUcp426odn5rtdTkcdjc= - - - Resources/description.rtfd/TXT.rtf - - hash - - O79gUM5bdy3TK5k10nzhees3tLA= - - hash2 - - qxVBcYejHswAjMa99pSek5Vgi52JP4dlQMTiIzbCkBs= - - - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/utils/install4j/Uninstall Old Jalview.scpt b/utils/install4j/Uninstall Old Jalview.scpt index 7afbebc..3ab3516 100644 Binary files a/utils/install4j/Uninstall Old Jalview.scpt and b/utils/install4j/Uninstall Old Jalview.scpt differ diff --git a/utils/install4j/install4j_template.install4j b/utils/install4j/install4j_template.install4j index bec9829..65261d8 100644 --- a/utils/install4j/install4j_template.install4j +++ b/utils/install4j/install4j_template.install4j @@ -1123,7 +1123,7 @@ return console.askYesNo(message, true); - + jre @@ -1131,84 +1131,99 @@ return console.askYesNo(message, true); - .install4j + jre.jar - dist + .install4j - resource + dist - getdown-launcher.jar + resource - getdown-launcher-old.jar + getdown-launcher.jar - getdown-launcher-new.jar + getdown-launcher-old.jar - *.jarv + getdown-launcher-new.jar - gettingdown.lock + *.jarv - *.log + gettingdown.lock - *.txt + *.log - *_new + *.txt - digest.txt + *_new - digest2.txt + digest.txt - getdown-launcher.jarv + digest2.txt - launcher.log + getdown-launcher.jarv + getdown-launcher-new.jarv + + + + + launcher.log + + + + proxy.txt + + + META-INF + +