summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-12-14 16:19:20 -0800
committerbrad kittenbrink <brad@lindenlab.com>2010-12-14 16:19:20 -0800
commit3641d012e3300244eaf2afbeab1a2cd5ca7a3785 (patch)
tree7ad8a5a82e03dcaef231ccb616b51bb38325fe71 /indra/viewer_components
parent5b5d2c428c90b5172d53e1fbc3eb6e27daffddcb (diff)
parentb159a961bd29e88503b1fa62c3e9cf4212e0bf1d (diff)
Merge
Diffstat (limited to 'indra/viewer_components')
-rw-r--r--indra/viewer_components/updater/scripts/darwin/update_install3
-rw-r--r--indra/viewer_components/updater/scripts/linux/update_install8
2 files changed, 6 insertions, 5 deletions
diff --git a/indra/viewer_components/updater/scripts/darwin/update_install b/indra/viewer_components/updater/scripts/darwin/update_install
index b174b3570a..9df382f119 100644
--- 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 100644
--- 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"