From 8ab943f470552dd9469d6025bcd359a67ad5513e Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Fri, 10 Dec 2010 15:41:14 -0800
Subject: [PATCH] fix working directory in install script and remove dependency
on open option --args which is 10.6 only. Also fix erroneous check in
process launcher which was mistakenly reporting a failed execution of the new
updater script.
---
indra/llcommon/llprocesslauncher.cpp | 9 +--------
.../updater/scripts/darwin/update_install | 3 ++-
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/indra/llcommon/llprocesslauncher.cpp b/indra/llcommon/llprocesslauncher.cpp
index 81e5f8820d7..4b0f6b02511 100644
--- a/indra/llcommon/llprocesslauncher.cpp
+++ b/indra/llcommon/llprocesslauncher.cpp
@@ -265,14 +265,7 @@ int LLProcessLauncher::launch(void)
delete[] fake_argv;
mProcessID = id;
-
- // At this point, the child process will have been created (since that's how vfork works -- the child borrowed our execution context until it forked)
- // If the process doesn't exist at this point, the exec failed.
- if(!isRunning())
- {
- result = -1;
- }
-
+
return result;
}
diff --git a/indra/viewer_components/updater/scripts/darwin/update_install b/indra/viewer_components/updater/scripts/darwin/update_install
index b174b3570a2..bfc12ada116 100755
--- a/indra/viewer_components/updater/scripts/darwin/update_install
+++ b/indra/viewer_components/updater/scripts/darwin/update_install
@@ -5,5 +5,6 @@
# to a marker file which should be created if the installer fails.q
#
-open ../Resources/mac-updater.app --args -dmg "$1" -name "Second Life Viewer 2" -marker "$2"
+cd "$(dirname $0)"
+../Resources/mac-updater.app/Contents/MacOS/mac-updater -dmg "$1" -name "Second Life Viewer 2" -marker "$2" &
exit 0
--
GitLab