From a7e727dd276eb89aa5bce6b261ae6bc47a6ae300 Mon Sep 17 00:00:00 2001 From: Miccal Matthews Date: Tue, 24 Jan 2017 13:55:02 +0800 Subject: [PATCH] Update adobe-cs6-design-standard.rb (#3179) Update adobe-cs6-design-standard to use `system_command`. --- Casks/adobe-cs6-design-standard.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Casks/adobe-cs6-design-standard.rb b/Casks/adobe-cs6-design-standard.rb index 899bd2a5f..400353a03 100644 --- a/Casks/adobe-cs6-design-standard.rb +++ b/Casks/adobe-cs6-design-standard.rb @@ -31,15 +31,25 @@ cask 'adobe-cs6-design-standard' do 'en_US' end - system '/usr/bin/killall', '-kill', 'SafariNotificationAgent' - system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Design Standard/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Design Standard/deploy/install-#{language}.xml" + system_command '/usr/bin/killall', + args: ['-kill', 'SafariNotificationAgent'] + system_command "#{staged_path}/Adobe CS6 Design Standard/Install.app/Contents/MacOS/Install", + args: [ + '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Design Standard/deploy/install-#{language}.xml" + ], + sudo: true FileUtils.cp "#{staged_path}/Adobe CS6 Design Standard/deploy/uninstall-#{language}.xml", "#{staged_path}/uninstall.xml" end uninstall_preflight do - system '/usr/bin/killall', '-kill', 'SafariNotificationAgent' - system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Design Standard/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/uninstall.xml" + system_command '/usr/bin/killall', + args: ['-kill', 'SafariNotificationAgent'] + system_command "#{staged_path}/Adobe CS6 Design Standard/Install.app/Contents/MacOS/Install", + args: [ + '--mode=silent', "--deploymentFile=#{staged_path}/uninstall.xml" + ], + sudo: true end caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services (e.g. Flashlight) are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identifify the conflicting processes.'