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 (file)
--- a/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist
+++ b/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist
@@ -11,11 +11,11 @@
        <key>CFBundleIconFile</key>
        <string>applet</string>
        <key>CFBundleIdentifier</key>
-       <string>com.apple.ScriptEditor.id.Uninstall-Old-Jalview--optional</string>
+       <string>com.apple.ScriptEditor.id.Uninstall-Old-Jalview</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>
-       <string>Uninstall Old Jalview (optional)</string>
+       <string>Uninstall Old Jalview</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
@@ -29,6 +29,28 @@
        </dict>
        <key>LSRequiresCarbon</key>
        <true/>
+       <key>NSAppleEventsUsageDescription</key>
+       <string>This script needs to control other applications to run.</string>
+       <key>NSAppleMusicUsageDescription</key>
+       <string>This script needs access to your music to run.</string>
+       <key>NSCalendarsUsageDescription</key>
+       <string>This script needs access to your calendars to run.</string>
+       <key>NSCameraUsageDescription</key>
+       <string>This script needs access to your camera to run.</string>
+       <key>NSContactsUsageDescription</key>
+       <string>This script needs access to your contacts to run.</string>
+       <key>NSHomeKitUsageDescription</key>
+       <string>This script needs access to your HomeKit Home to run.</string>
+       <key>NSMicrophoneUsageDescription</key>
+       <string>This script needs access to your microphone to run.</string>
+       <key>NSPhotoLibraryUsageDescription</key>
+       <string>This script needs access to your photos to run.</string>
+       <key>NSRemindersUsageDescription</key>
+       <string>This script needs access to your reminders to run.</string>
+       <key>NSSiriUsageDescription</key>
+       <string>This script needs access to Siri to run.</string>
+       <key>NSSystemAdministrationUsageDescription</key>
+       <string>This script needs access to administer this system to run.</string>
        <key>WindowState</key>
        <dict>
                <key>bundleDividerCollapsed</key>
@@ -36,7 +58,7 @@
                <key>bundlePositionOfDivider</key>
                <real>0.0</real>
                <key>dividerCollapsed</key>
-               <false/>
+               <true/>
                <key>eventLogLevel</key>
                <integer>2</integer>
                <key>name</key>
@@ -44,9 +66,9 @@
                <key>positionOfDivider</key>
                <real>421</real>
                <key>savedFrame</key>
-               <string>20 1180 700 672 0 0 3360 1867 </string>
+               <string>272 342 1754 910 0 0 3360 1867 </string>
                <key>selectedTab</key>
-               <string>description</string>
+               <string>result</string>
        </dict>
 </dict>
 </plist>

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 (executable)
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 (file)
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 (file)
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 (file)
--- 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 (file)
index 9e97319..0000000
--- a/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>files</key>
-       <dict>
-               <key>Resources/Scripts/main.scpt</key>
-               <data>
-               fqUypmAyNT7kgykBjNqtdjMM1Mg=
-               </data>
-               <key>Resources/applet.icns</key>
-               <data>
-               vIRz6m6+ZxDNfi4iTsXj5rdcZUA=
-               </data>
-               <key>Resources/applet.rsrc</key>
-               <data>
-               aTN+E9yPFzj2wRwcmefcTGGpQYM=
-               </data>
-               <key>Resources/description.rtfd/TXT.rtf</key>
-               <data>
-               O79gUM5bdy3TK5k10nzhees3tLA=
-               </data>
-       </dict>
-       <key>files2</key>
-       <dict>
-               <key>Resources/Scripts/main.scpt</key>
-               <dict>
-                       <key>hash</key>
-                       <data>
-                       fqUypmAyNT7kgykBjNqtdjMM1Mg=
-                       </data>
-                       <key>hash2</key>
-                       <data>
-                       EQiIOT1XOBWGSwXZlfTXIrxNy+61mjRDze6gR+e3c2U=
-                       </data>
-               </dict>
-               <key>Resources/applet.icns</key>
-               <dict>
-                       <key>hash</key>
-                       <data>
-                       vIRz6m6+ZxDNfi4iTsXj5rdcZUA=
-                       </data>
-                       <key>hash2</key>
-                       <data>
-                       D7gig1wJlOzR/Iy+y6TESLN0j/cIpjThUyO1pj5fZEc=
-                       </data>
-               </dict>
-               <key>Resources/applet.rsrc</key>
-               <dict>
-                       <key>hash</key>
-                       <data>
-                       aTN+E9yPFzj2wRwcmefcTGGpQYM=
-                       </data>
-                       <key>hash2</key>
-                       <data>
-                       fQhBZ0v2JeXFde/OYcgUVYOfUcp426odn5rtdTkcdjc=
-                       </data>
-               </dict>
-               <key>Resources/description.rtfd/TXT.rtf</key>
-               <dict>
-                       <key>hash</key>
-                       <data>
-                       O79gUM5bdy3TK5k10nzhees3tLA=
-                       </data>
-                       <key>hash2</key>
-                       <data>
-                       qxVBcYejHswAjMa99pSek5Vgi52JP4dlQMTiIzbCkBs=
-                       </data>
-               </dict>
-       </dict>
-       <key>rules</key>
-       <dict>
-               <key>^Resources/</key>
-               <true/>
-               <key>^Resources/.*\.lproj/</key>
-               <dict>
-                       <key>optional</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>1000</real>
-               </dict>
-               <key>^Resources/.*\.lproj/locversion.plist$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>1100</real>
-               </dict>
-               <key>^Resources/Base\.lproj/</key>
-               <dict>
-                       <key>weight</key>
-                       <real>1010</real>
-               </dict>
-               <key>^version.plist$</key>
-               <true/>
-       </dict>
-       <key>rules2</key>
-       <dict>
-               <key>.*\.dSYM($|/)</key>
-               <dict>
-                       <key>weight</key>
-                       <real>11</real>
-               </dict>
-               <key>^(.*/)?\.DS_Store$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>2000</real>
-               </dict>
-               <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-               <dict>
-                       <key>nested</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>10</real>
-               </dict>
-               <key>^.*</key>
-               <true/>
-               <key>^Info\.plist$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-               <key>^PkgInfo$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-               <key>^Resources/</key>
-               <dict>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-               <key>^Resources/.*\.lproj/</key>
-               <dict>
-                       <key>optional</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>1000</real>
-               </dict>
-               <key>^Resources/.*\.lproj/locversion.plist$</key>
-               <dict>
-                       <key>omit</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>1100</real>
-               </dict>
-               <key>^Resources/Base\.lproj/</key>
-               <dict>
-                       <key>weight</key>
-                       <real>1010</real>
-               </dict>
-               <key>^[^/]+$</key>
-               <dict>
-                       <key>nested</key>
-                       <true/>
-                       <key>weight</key>
-                       <real>10</real>
-               </dict>
-               <key>^embedded\.provisionprofile$</key>
-               <dict>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-               <key>^version\.plist$</key>
-               <dict>
-                       <key>weight</key>
-                       <real>20</real>
-               </dict>
-       </dict>
-</dict>
-</plist>

diff --git a/utils/install4j/Uninstall Old Jalview.scpt b/utils/install4j/Uninstall Old Jalview.scpt
index 7afbebc..3ab3516 100644 (file)
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 (file)
--- a/utils/install4j/install4j_template.install4j
+++ b/utils/install4j/install4j_template.install4j
@@ -1123,7 +1123,7 @@ return console.askYesNo(message, true);
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.files.DeleteFileAction">
                       <void property="files">
-                        <array class="java.io.File" length="17">
+                        <array class="java.io.File" length="20">
                           <void index="0">
                             <object class="java.io.File">
                               <string>jre</string>
@@ -1131,84 +1131,99 @@ return console.askYesNo(message, true);
                           </void>
                           <void index="1">
                             <object class="java.io.File">
-                              <string>.install4j</string>
+                              <string>jre.jar</string>
                             </object>
                           </void>
                           <void index="2">
                             <object class="java.io.File">
-                              <string>dist</string>
+                              <string>.install4j</string>
                             </object>
                           </void>
                           <void index="3">
                             <object class="java.io.File">
-                              <string>resource</string>
+                              <string>dist</string>
                             </object>
                           </void>
                           <void index="4">
                             <object class="java.io.File">
-                              <string>getdown-launcher.jar</string>
+                              <string>resource</string>
                             </object>
                           </void>
                           <void index="5">
                             <object class="java.io.File">
-                              <string>getdown-launcher-old.jar</string>
+                              <string>getdown-launcher.jar</string>
                             </object>
                           </void>
                           <void index="6">
                             <object class="java.io.File">
-                              <string>getdown-launcher-new.jar</string>
+                              <string>getdown-launcher-old.jar</string>
                             </object>
                           </void>
                           <void index="7">
                             <object class="java.io.File">
-                              <string>*.jarv</string>
+                              <string>getdown-launcher-new.jar</string>
                             </object>
                           </void>
                           <void index="8">
                             <object class="java.io.File">
-                              <string>gettingdown.lock</string>
+                              <string>*.jarv</string>
                             </object>
                           </void>
                           <void index="9">
                             <object class="java.io.File">
-                              <string>*.log</string>
+                              <string>gettingdown.lock</string>
                             </object>
                           </void>
                           <void index="10">
                             <object class="java.io.File">
-                              <string>*.txt</string>
+                              <string>*.log</string>
                             </object>
                           </void>
                           <void index="11">
                             <object class="java.io.File">
-                              <string>*_new</string>
+                              <string>*.txt</string>
                             </object>
                           </void>
                           <void index="12">
                             <object class="java.io.File">
-                              <string>digest.txt</string>
+                              <string>*_new</string>
                             </object>
                           </void>
                           <void index="13">
                             <object class="java.io.File">
-                              <string>digest2.txt</string>
+                              <string>digest.txt</string>
                             </object>
                           </void>
                           <void index="14">
                             <object class="java.io.File">
-                              <string>getdown-launcher.jarv</string>
+                              <string>digest2.txt</string>
                             </object>
                           </void>
                           <void index="15">
                             <object class="java.io.File">
-                              <string>launcher.log</string>
+                              <string>getdown-launcher.jarv</string>
                             </object>
                           </void>
                           <void index="16">
                             <object class="java.io.File">
+                              <string>getdown-launcher-new.jarv</string>
+                            </object>
+                          </void>
+                          <void index="17">
+                            <object class="java.io.File">
+                              <string>launcher.log</string>
+                            </object>
+                          </void>
+                          <void index="18">
+                            <object class="java.io.File">
                               <string>proxy.txt</string>
                             </object>
                           </void>
+                          <void index="19">
+                            <object class="java.io.File">
+                              <string>META-INF</string>
+                            </object>
+                          </void>
                         </array>
                       </void>
                       <void property="recursive">