From 09cc75f1d2c3be5143a4078144740dfb074ceb75 Mon Sep 17 00:00:00 2001
From: "jamiewalch@google.com"
 <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 9 May 2012 01:18:44 +0000
Subject: Fixed installer not explicitly start (load does it implicitly).

BUG=None
TEST=Manual

Review URL: https://chromiumcodereview.appspot.com/10332064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135965 0039d316-1c4b-4281-b951-d872f2087c98
---
 remoting/host/installer/mac/Scripts/remoting_postflight.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/remoting/host/installer/mac/Scripts/remoting_postflight.sh b/remoting/host/installer/mac/Scripts/remoting_postflight.sh
index 7fc5a8c..def76ae 100755
--- a/remoting/host/installer/mac/Scripts/remoting_postflight.sh
+++ b/remoting/host/installer/mac/Scripts/remoting_postflight.sh
@@ -32,6 +32,11 @@ if [[ ! -f "$CONFIG_FILE" ]]; then
   chmod +a "$USER:allow:read" "$CONFIG_FILE"
 fi
 
+# If there is a backup _enabled file, re-enable the service.
+if [[ -f "$ENABLED_FILE_BACKUP" ]]; then
+  mv "$ENABLED_FILE_BACKUP" "$ENABLED_FILE"
+fi
+
 # Load the service.
 # The launchctl command we'd like to run:
 #   launchctl load -w -S Aqua $PLIST
@@ -48,13 +53,5 @@ if [[ -n "$USERNAME" && -n "$USERID" ]]; then
   launchctl bsexec "$USERID" sudo -u "$USERNAME" launchctl load -w -S Aqua "$PLIST"
 fi
 
-# If there is a backup _enabled file, re-enable the service.
-if [[ -f "$ENABLED_FILE_BACKUP" ]]; then
-  mv "$ENABLED_FILE_BACKUP" "$ENABLED_FILE"
-  if [[ -n "$USERNAME" && -n "$USERID" ]]; then
-    launchctl bsexec "$USERID" sudo -u "$USERNAME" launchctl start -w -S Aqua "$NAME"
-  fi
-fi
-
 # Register a ticket with Keystone so we're updated.
 $KSADMIN --register --productid "$KSPID" --version "$KSPVERSION" --xcpath "$PLIST" --url "$KSUPDATE"
-- 
cgit v1.1