• Changed a symbol name, comments.

Author: jerrykrinock

Diff for: SSYLaunchdGuy.h

@@ -5,8 +5,14 @@ extern NSString* const SSYLaunchdGuyErrorKeyNSTaskError ;
 extern NSString* const SSYLaunchdGuyErrorKeyCommandStderr ;
 
 /*!
- @brief    A class for manipulating launchd agents.  All methods in this
- class manipulate only launchd agents in the current user's Mac account.
+ @brief    A class for manipulating launchd agents in the current Macintosh
+ user account.
+ 
+ @details  This class is a wrapper around what Apple now calls "legacy"
+ commands of the launchctl command-line program.  See man launchctl(1).  I
+ don't know why these commands are "legacy".  They are not "deprecated".
+ They still work fine for me (macOS 10.12.5).  However, I would not use this
+ code for new designs without further research.
 
  @details   Agent names will be of the form:
     identifier.agentIndex

Diff for: SSYLaunchdGuy.m

@@ -607,7 +607,6 @@ + (BOOL)removeAgentWithLabel:(NSString*)label
 	NSString* directory = [SSYLaunchdBasics homeLaunchAgentsPath] ;
 	NSString* plistPath = [directory stringByAppendingPathComponent:filename] ;
 
-	// Added in BookMacster 1.5.7:
 	if (![[NSFileManager defaultManager] fileExistsAtPath:plistPath]) {
 		return YES ;
 	}
@@ -617,7 +616,7 @@ + (BOOL)removeAgentWithLabel:(NSString*)label
 	BOOL isLoaded = [self isLoadedLabel:label] ;
 
 
-	NSString* cmdPath = [[NSFileManager defaultManager] temporaryFilePath] ;
+	NSString* scriptPath = [[NSFileManager defaultManager] temporaryFilePath] ;
 	// I presumed we need execute permissions, which we don't get from
 	// -[NSString writeToFile::], so I do it this way:
 	NSNumber* octal755 = [NSNumber numberWithUnsignedLong:0755] ;
@@ -629,15 +628,15 @@ + (BOOL)removeAgentWithLabel:(NSString*)label
 								octal755, NSFilePosixPermissions,
 								nil] ;
 
-	// Generate the command (cmd) as a multi-line string
+	// Generate the shell script as a multi-line string
 	NSMutableString* formatString = [[NSMutableString alloc] init] ;
 	[formatString appendString:
 	 @"#!/bin/sh\n"                                       // shebang
 	 @"PLIST_PATH=\"%@\"\n"                               // define environment variable
 	 @"sleep %d\n" ] ;                                    // for optional delaySeconds
 	if (isLoaded) {
 		[formatString appendString:
-		 @"/bin/launchctl unload -wF \"$PLIST_PATH\"\n"] ;    // Unload the agent
+		 @"/bin/launchctl unload -wF \"$PLIST_PATH\"\n"] ;// Unload the agent
 	}
 	if (justReload) {
 		[formatString appendString:
@@ -646,26 +645,26 @@ + (BOOL)removeAgentWithLabel:(NSString*)label
 	}
 	else {
 		[formatString appendString:
-		 @"rm \"$PLIST_PATH\"\n" ] ;                      // Remove the plist file
+		 @"/bin/rm -f \"$PLIST_PATH\"\n" ] ;              // Remove the plist file, if still present.  It might be gone if a previous run of this method was in process and had not deleted it before this method was invoked again.
 	}	
 	[formatString appendString:
-	 @"rm \"%@\"\n"] ;                                    // Remove this script's file (self-destruct)
-	NSString* cmd = [NSString stringWithFormat:
-					 formatString,
-					 plistPath,
-					 delaySeconds,
-					 cmdPath] ;
+	 @"/bin/rm \"%@\"\n"] ;                               // Remove this script's file (self-destruct)
+	NSString* script = [NSString stringWithFormat:
+                        formatString,
+                        plistPath,
+                        delaySeconds,
+                        scriptPath] ;
 	[formatString release] ;
 
-	// Write the command to a file
-	NSData* data = [cmd dataUsingEncoding:NSUTF8StringEncoding] ;
-	[[NSFileManager defaultManager] createFileAtPath:cmdPath
+	// Write the script to a file
+	NSData* data = [script dataUsingEncoding:NSUTF8StringEncoding] ;
+	[[NSFileManager defaultManager] createFileAtPath:scriptPath
 											contents:data
 										  attributes:attributes] ;
 
-    // Run that file
+    // Run that script file
     NSTask* task = [[NSTask alloc] init] ;
-    [task setLaunchPath:cmdPath] ;
+    [task setLaunchPath:scriptPath] ;
 	[task launch] ;
 	[task release] ;
 
@@ -676,7 +675,7 @@ + (BOOL)removeAgentWithLabel:(NSString*)label
     if (timeout > 0.0) {
 		SSYPathWaiter* waiter = [[SSYPathWaiter alloc] init] ;
 		ok = [waiter blockUntilWatchFlags:SSYPathObserverChangeFlagsDelete
-									 path:cmdPath
+									 path:scriptPath
 								  timeout:timeout] ;
 		[waiter release] ;
 	}