Removes non-functional --restart-policy flag from SoftwareUpdateCommand.php

Author: jonesiscoding

README.md

@@ -143,13 +143,14 @@ Works with the built in `softwareupdate` command and your MDM to facilitate the
 
 * Wait Condition Monitoring (similar to the Wait command documented below), including whether the SUS is available.
 * Can trigger a Jamf policy for the installation of updates rather than using `softwareupdate`
-* Can trigger a Jamf policy for the restart of a system, rather than using `softwareupdate` or `shutdown`.
 * Returns a non-zero exit code when a lack of disk space prevents installations.
 * Allows for Json output.
 * Can provide a simple count of updates to install.
 * Can provide a summary of relevant information to performing updates.
 * If running `softwareupdate` without user authentication is prevented, opens the Software Update Preference pane for the console user.
 
+IMPORTANT NOTE: This command currently requires the `at` daemon for restart functionality.
+
 ### Installations (--install)
 
 **Apple Silicon Macs**
@@ -160,8 +161,6 @@ If the computer is using Apple Silicon, the Software Update preference pane is o
 
 If the `install-policy` option is provided, the Jamf Policy is used instead of running `softwareupdate` for the installations, otherwise the `softwareupdate` binary is utilized. When using the `softwareupdate` binary, all non-restart updates are installed individually, then any updates requiring a restart are installed in a batch.  This allows us to provide the maximum amount of feedback on the success or failure of updates installed.
 
-If the `restart-policy` option is provided, the Jamf Policy is sued instead of running `shutdown` for updates that require a restart or halt.  This allows for an authenticated restart on FileVault 2 enabled Macs.  If the `restart-policy` option is not provided, the `shutdown` binary is used to restart or halt the computer as needed for the updates that were installed.
-
 |Flags  | Purpose |  
 |--|--|  
 | install | Installs available updates |  
@@ -176,7 +175,6 @@ If the `restart-policy` option is provided, the Jamf Policy is sued instead of r
 | skip-screen | Do not wait for screen availability |
 | wait | The number of seconds to wait for wait conditions.  Defaults to 60 seconds. |
 | install-policy | The trigger or ID for a Jamf Pro policy that installs updates using the Software Update payload. |
-| restart-policy | The trigger or ID for a Jamf Pro policy with no payload that forces a FileVault 2 authenticated restart. |
 | json | Show any output in JSON format. |
 | timeout | The amount of time in seconds that is allowed for any one `softwareupdate` command to complete.  Defaults to 7200 seconds (2 hours)
 

bin/console

@@ -31,6 +31,6 @@ $command[] = new DevCoding\Jss\Easy\Command\Preferences\CC\BackupCommand();
 $command[] = new DevCoding\Jss\Easy\Command\Preferences\CC\TransferCommand();
 // Other Commands
 $command[] = new DevCoding\Jss\Easy\Command\PrepCommand();
-$app       = new Application('Jez', 'v4.0.5');
+$app       = new Application('Jez', 'v4.0.6');
 $app->addCommands($command);
 $app->run();

composer.json

@@ -16,7 +16,7 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev",
-    "version": "4.0.5",
+    "version": "4.0.6",
     "require": {
         "php": ">=7.1",
         "ext-json": "*",

dist/jez.phar

@@ -47,7 +47,6 @@ protected function configure()
     if ($this->isJamf())
     {
       $this->addOption('install-policy', null, InputOption::VALUE_REQUIRED, 'Install Policy Trigger or ID');
-      $this->addOption('restart-policy', null, InputOption::VALUE_REQUIRED, 'Restart Policy Trigger or ID');
     }
   }
 
@@ -585,35 +584,24 @@ protected function executeInstall(InputInterface $input, OutputInterface $output
    */
   protected function executeRestart(InputInterface $input, OutputInterface $output)
   {
-    if ($this->isJamf() && $policy = $this->getRestartPolicy())
+    if ($this->isHaltRequired())
     {
-      // Run the restart policy
-      $this->io()->msg('Triggering System Restart via Jamf', 60);
-      $this->json()->append(['jamf_restart' => $policy, 'restart' => true]);
-      $flag = is_numeric($policy) ? 'id' : 'trigger';
-      $data = escapeshellarg($policy);
-      $cmd  = $this->getAtCommand(sprintf('/usr/local/bin/jamf policy --%s %s', $flag, $data));
+      $this->json()->append(['halt' => true]);
+      $this->io()->msg('Triggering System Shutdown', 60);
+      // Trigger Restart w/ Delay to Finish & Log
+      $cmd = $this->getAtCommand('shutdown -h +2m');
     }
     else
     {
-      if ($this->isHaltRequired())
-      {
-        $this->json()->append(['halt' => true]);
-        $this->io()->msg('Triggering System Shutdown', 60);
-        // Trigger Restart w/ Delay to Finish & Log
-        $cmd = $this->getAtCommand('shutdown -h +2m');
-      }
-      else
-      {
-        $this->json()->append(['restart' => true]);
-        $this->io()->msg('Triggering System Restart', 60);
+      $this->json()->append(['restart' => true]);
+      $this->io()->msg('Triggering System Restart', 60);
 
-        // Trigger Restart w/ Delay to Finish & Log
-        $cmd = $this->getAtCommand('shutdown -r +2m');
-      }
+      // Trigger Restart w/ Delay to Finish & Log
+      $cmd = $this->getAtCommand('shutdown -r +2m');
     }
 
-    if ($this->getShellExec($cmd))
+    exec($cmd, $output, $retval);
+    if (0 === $retval)
     {
       $this->io()->successln('[SUCCESS]');
 
@@ -715,6 +703,11 @@ protected function executeSoftwareUpdate(InputInterface $input, OutputInterface
         $this->io()->successln('[SUCCESS]');
         $this->json()->append(['install' => array_fill_keys($remains, true)]);
 
+        if (OutputInterface::VERBOSITY_VERBOSE === $this->io()->getVerbosity())
+        {
+          $this->io()->writeln($SU->getOutput(false));
+        }
+
         // Will continue to a restart
         $retval = self::CONTINUE;
       }
@@ -962,7 +955,7 @@ protected function getAtCommand($cmd)
   {
     if (file_exists('/usr/bin/at'))
     {
-      return sprintf("%s now <<ENDBGCMD >/dev/null 2>&1\n%s\nENDBGCMD", '/usr/bin/at', $cmd);
+      return sprintf('echo "%s" | %s now + 2 minutes >/dev/null 2>&1', $cmd, '/usr/bin/at');
     }
 
     throw new \Exception('The AT binary was not found at /usr/bin/at');