diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-12-14 11:45:06 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-12-14 11:45:06 -0800 |
| commit | b159a961bd29e88503b1fa62c3e9cf4212e0bf1d (patch) | |
| tree | f3b7ced30f0baaee2a8af2a6903c1f42b6f04c5e /indra | |
| parent | dbd06789e6c91f6d9a42e5aafa98996ada915c21 (diff) | |
| parent | 4f9e6ff2ffcd3c277399d35e5765b8525b3e1b53 (diff) | |
Merge CHOP-267 fixes with latest viewer-beta.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llprocesslauncher.cpp | 9 | ||||
| -rwxr-xr-x | indra/viewer_components/updater/scripts/darwin/update_install | 3 | ||||
| -rwxr-xr-x | indra/viewer_components/updater/scripts/linux/update_install | 8 |
3 files changed, 7 insertions, 13 deletions
diff --git a/indra/llcommon/llprocesslauncher.cpp b/indra/llcommon/llprocesslauncher.cpp index 81e5f8820d..4b0f6b0251 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 b174b3570a..9df382f119 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 diff --git a/indra/viewer_components/updater/scripts/linux/update_install b/indra/viewer_components/updater/scripts/linux/update_install index fef5ef7d09..a271926e25 100755 --- a/indra/viewer_components/updater/scripts/linux/update_install +++ b/indra/viewer_components/updater/scripts/linux/update_install @@ -1,10 +1,10 @@ #! /bin/bash -INSTALL_DIR=$(cd "$(dirname $0)/.." ; pwd) -export LD_LIBRARY_PATH=$INSTALL_DIR/lib +INSTALL_DIR=$(cd "$(dirname "$0")/.." ; pwd) +export LD_LIBRARY_PATH="$INSTALL_DIR/lib" bin/linux-updater.bin --file "$1" --dest "$INSTALL_DIR" --name "Second Life Viewer 2" --stringsdir "$INSTALL_DIR/skins/default/xui/en" --stringsfile "strings.xml" if [ $? -ne 0 ] - then touch $2 + then touch "$2" fi -rm -f $1 +rm -f "$1" |