summaryrefslogtreecommitdiff
path: root/indra/viewer_components/updater/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'indra/viewer_components/updater/scripts')
-rwxr-xr-x[-rw-r--r--]indra/viewer_components/updater/scripts/darwin/update_install8
-rw-r--r--indra/viewer_components/updater/scripts/windows/update_install.bat3
2 files changed, 9 insertions, 2 deletions
diff --git a/indra/viewer_components/updater/scripts/darwin/update_install b/indra/viewer_components/updater/scripts/darwin/update_install
index c061d2818f..b174b3570a 100644..100755
--- a/indra/viewer_components/updater/scripts/darwin/update_install
+++ b/indra/viewer_components/updater/scripts/darwin/update_install
@@ -1,3 +1,9 @@
#! /bin/bash
-open ../Resources/mac-updater.app --args -dmg "$1" -name "Second Life Viewer 2"
+#
+# The first argument contains the path to the installer app. The second a path
+# 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"
+exit 0
diff --git a/indra/viewer_components/updater/scripts/windows/update_install.bat b/indra/viewer_components/updater/scripts/windows/update_install.bat
index def33c1346..44ccef010b 100644
--- a/indra/viewer_components/updater/scripts/windows/update_install.bat
+++ b/indra/viewer_components/updater/scripts/windows/update_install.bat
@@ -1 +1,2 @@
-start /WAIT %1 \ No newline at end of file
+start /WAIT %1 /SKIP_DIALOGS
+IF ERRORLEVEL 1 ECHO ERRORLEVEL > %2