Merge pull request #290 from sveinbjornt/5.5-release2

5.5 release2

Author: sveinbjornt

Application/PlatypusWindowController.m

@@ -417,7 +417,7 @@ - (BOOL)createApplication:(NSString *)destination {
 
     // We set this specifically
     spec[AppSpecKey_DestinationPath] = appPath;
-    spec[AppSpecKey_ExecutablePath] = [[NSBundle mainBundle] pathForResource:CMDLINE_SCRIPTEXEC_GZIP_NAME ofType:nil];
+    spec[AppSpecKey_ExecutablePath] = [[NSBundle mainBundle] pathForResource:CMDLINE_SCRIPTEXEC_BIN_B64_NAME ofType:nil];
     spec[AppSpecKey_NibPath] = [[NSBundle mainBundle] pathForResource:CMDLINE_NIB_NAME ofType:nil];
     spec[AppSpecKey_SymlinkFiles] = @((BOOL)[createSymlinksCheckbox intValue]);
     spec[AppSpecKey_StripNib] = @((BOOL)[stripNibFileCheckbox intValue]);
@@ -869,7 +869,8 @@ - (NSString *)estimatedAppSizeString {
     estimatedAppSize += [WORKSPACE fileOrFolderSize:[iconController icnsFilePath]];
     estimatedAppSize += [WORKSPACE fileOrFolderSize:[dropSettingsController docIconPath]];
     estimatedAppSize += [WORKSPACE fileOrFolderSize:[scriptPathTextField stringValue]];
-    estimatedAppSize += ([WORKSPACE fileOrFolderSize:[[NSBundle mainBundle] pathForResource:CMDLINE_SCRIPTEXEC_GZIP_NAME ofType:nil]] * 3.8);
+    // base64 encoding expands data to ~1.33x, so estimate original size by mult. * 0.75
+    estimatedAppSize += ([WORKSPACE fileOrFolderSize:[[NSBundle mainBundle] pathForResource:CMDLINE_SCRIPTEXEC_BIN_B64_NAME ofType:nil]] * 0.75);
 
     // Nib size is much smaller if compiled with ibtool
     UInt64 nibSize = [WORKSPACE fileOrFolderSize:[[NSBundle mainBundle] pathForResource:@"MainMenu.nib" ofType:nil]];
@@ -878,8 +879,6 @@ - (NSString *)estimatedAppSizeString {
     }
     estimatedAppSize += nibSize;
 
-    estimatedAppSize -= 50 * 1024; // Just because it's more accurate!
-    
     // Bundled files altogether
     estimatedAppSize += [bundledFilesController totalSizeOfFiles];
 

Application/Resources/InstallCommandLineTool.sh

@@ -19,7 +19,7 @@ cd "$1"
 
 echo "Copying resources to share directory"
 # ScriptExec binary
-gunzip -c ScriptExec.gz > "/usr/local/share/platypus/ScriptExec"
+base64 -d -i ScriptExec.b64 > "/usr/local/share/platypus/ScriptExec"
 # Nib
 cp -r MainMenu.nib "/usr/local/share/platypus/MainMenu.nib"
 # Set permissions

Application/Resources/Platypus-Info.plist

@@ -445,7 +445,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1316</string>
+	<string>1326</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

Application/Resources/UninstallPlatypus.sh

@@ -3,22 +3,17 @@
 # UninstallPlatypus.sh
 # Platypus
 
-cd "$1"
-
-if [ -e "%%APP_SUPPORT_FOLDER%%" ]
-then
+if [ -e "%%PROGRAM_APP_SUPPORT_PATH%%" ]; then
     echo "Deleting application support folder..."
-    mv "%%APP_SUPPORT_FOLDER%%" "~/.Trash/%%PROGRAM_NAME%%ApplicationSupport-TRASHED-$RANDOM"
+    mv "%%PROGRAM_APP_SUPPORT_PATH%%" ~/.Trash/%%PROGRAM_NAME%%ApplicationSupport-TRASHED-$RANDOM
 fi
 
-if [ -e "~/Library/Preferences/%%PROGRAM_BUNDLE_IDENTIFIER%%.plist" ]
-then
+if [ -e ~/Library/Preferences/%%PROGRAM_BUNDLE_IDENTIFIER%%.plist ]; then
     echo "Deleting %%PROGRAM_NAME%% preferences..."
-    mv "~/Library/Preferences/%%PROGRAM_BUNDLE_IDENTIFIER%%.plist" "~/.Trash/%%PROGRAM_BUNDLE_IDENTIFIER%%-TRASHED-$RANDOM.plist"
+    mv ~/Library/Preferences/%%PROGRAM_BUNDLE_IDENTIFIER%%.plist ~/.Trash/%%PROGRAM_BUNDLE_IDENTIFIER%%-TRASHED-$RANDOM.plist
 fi
 
-if [ -e "$1/../../../%%PROGRAM_NAME%%.app" ]
-then
+if [ -e "%%APP_BUNDLE_PATH%%" ]; then
     echo "Moving %%PROGRAM_NAME%%.app to Trash"
-    mv "$1/../../../%%PROGRAM_NAME%%.app" "~/.Trash/%%PROGRAM_NAME%%-TRASHED-$RANDOM.app"
+    mv "%%APP_BUNDLE_PATH%%" ~/.Trash/%%PROGRAM_NAME%%-TRASHED-$RANDOM.app
 fi

Application/SettingsController.m

@@ -399,10 +399,10 @@ - (NSDictionary *)commandEnvironmentDictionary {
             @"PROGRAM_MIN_SYS_VERSION": PROGRAM_MIN_SYS_VERSION,
             @"PROGRAM_BUNDLE_IDENTIFIER": PROGRAM_BUNDLE_IDENTIFIER,
             @"PROGRAM_AUTHOR": PROGRAM_AUTHOR,
+            @"PROGRAM_APP_SUPPORT_PATH": PROGRAM_APP_SUPPORT_PATH,
             @"CMDLINE_PROGNAME_BUNDLE": CMDLINE_PROGNAME_BUNDLE,
             @"CMDLINE_PROGNAME": CMDLINE_PROGNAME,
             @"CMDLINE_SCRIPTEXEC_BIN_NAME": CMDLINE_SCRIPTEXEC_BIN_NAME,
-            @"CMDLINE_SCRIPTEXEC_GZIP_NAME": CMDLINE_SCRIPTEXEC_GZIP_NAME,
             @"CMDLINE_MANPAGE_NAME": CMDLINE_MANPAGE_NAME,
             @"CMDLINE_DEFAULT_ICON_NAME": CMDLINE_DEFAULT_ICON_NAME,
             @"CMDLINE_NIB_NAME": CMDLINE_NIB_NAME,
@@ -413,6 +413,7 @@ - (NSDictionary *)commandEnvironmentDictionary {
             @"CMDLINE_MANDIR_PATH": CMDLINE_MANDIR_PATH,
             @"CMDLINE_MANPAGE_PATH": CMDLINE_MANPAGE_PATH,
             @"CMDLINE_NIB_PATH": CMDLINE_NIB_PATH,
+            @"APP_BUNDLE_PATH": [[NSBundle mainBundle] bundlePath],
             @"CMDLINE_SCRIPT_EXEC_PATH": CMDLINE_SCRIPT_EXEC_PATH};
 }
 

CHANGES.md

@@ -1,12 +1,16 @@
 # Platypus Version History
 
-### For 5.5.0 - 17/11/2025
+### For 5.5.0 - 02/12/2025
 
-* Fixed bug where the argument settings window would lock up the interface
+* Platypus.app and the platypus command line tool are now notarized by Apple
+* Now requires macOS 11 "Big Sur" or later
+* Fixed bug where the Argument settings dialog could lock up the interface
 * Better support for Dark Mode
-* Platypus now requires macOS 11 "Big Sur" or later
 * Preferences now named Settings according to new macOS convention
-* Modernized codebase
+* Added `--executable-path` and `--nib-path` flags to command line tool to allow users to inject custom binaries or nib files
+* Improved install script for command line tool to ease installation in CI environments
+* Extensive modernization of codebase
+* Much-improved tests for command line tool
 
 ### For 5.4.1 - 22/10/2022
 

Common.h

@@ -61,7 +61,8 @@
 #define CMDLINE_PROGNAME_BUNDLE     @"platypus_clt"
 #define CMDLINE_PROGNAME            @"platypus"
 #define CMDLINE_SCRIPTEXEC_BIN_NAME @"ScriptExec"
-#define CMDLINE_SCRIPTEXEC_GZIP_NAME @"ScriptExec.gz"
+#define CMDLINE_SCRIPTEXEC_BIN_GZ_NAME @"ScriptExec.gz"
+#define CMDLINE_SCRIPTEXEC_BIN_B64_NAME @"ScriptExec.b64"
 #define CMDLINE_MANPAGE_NAME        @"platypus.1.gz"
 #define CMDLINE_DEFAULT_ICON_NAME   @"PlatypusDefault.icns"
 #define CMDLINE_NIB_NAME            @"MainMenu.nib"
@@ -82,6 +83,7 @@
 
 #define APPBUNDLE_SUFFIX            @".app"
 #define GZIP_SUFFIX                 @".gz"
+#define B64_SUFFIX                  @".b64"
 
 #define DEFAULT_TEXT_FONT_NAME      @"Monaco"
 #define DEFAULT_TEXT_FONT_SIZE      13.0