diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-15 14:38:13 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-15 14:38:13 -0800 |
| commit | 3e95634aaf89a5ecd12d7e08d96679cbb3d1bba8 (patch) | |
| tree | 117222bf666e577e517bdec4f99bf6a5f0d66ab3 /indra/viewer_components/updater/scripts | |
| parent | 35fc90e8aaebc10a5a01c58247c29c8103220578 (diff) | |
| parent | f47c42bb10cd3291ce966be7b209b422646dff19 (diff) | |
merge
Diffstat (limited to 'indra/viewer_components/updater/scripts')
| -rwxr-xr-x[-rw-r--r--] | indra/viewer_components/updater/scripts/darwin/update_install | 8 | ||||
| -rw-r--r-- | indra/viewer_components/updater/scripts/windows/update_install.bat | 3 |
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
|