From 47a4ce19c7fea465eefe85ec236394fb2990470d Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 30 Sep 2011 13:16:29 -0400
Subject: [PATCH] SH-2515 WIP - changed app name in linux updater, dir name in
windows installer
---
indra/newview/viewer_manifest.py | 2 +-
indra/viewer_components/updater/scripts/linux/update_install | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
mode change 100644 => 100755 indra/viewer_components/updater/scripts/linux/update_install
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index aea5dc06491..6165292457e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -573,7 +573,7 @@ def package_finish(self):
grid_vars_template = """
OutFile "%(installer_file)s"
!define INSTFLAGS "%(flags)s"
- !define INSTNAME "SecondLifeViewer2"
+ !define INSTNAME "SecondLifeViewer"
!define SHORTCUT "Second Life Viewer"
!define URLNAME "secondlife"
Caption "Second Life"
diff --git a/indra/viewer_components/updater/scripts/linux/update_install b/indra/viewer_components/updater/scripts/linux/update_install
old mode 100644
new mode 100755
index 88451340eca..e0505a9f72f
--- a/indra/viewer_components/updater/scripts/linux/update_install
+++ b/indra/viewer_components/updater/scripts/linux/update_install
@@ -1,7 +1,7 @@
#! /bin/bash
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"
+bin/linux-updater.bin --file "$1" --dest "$INSTALL_DIR" --name "Second Life Viewer" --stringsdir "$INSTALL_DIR/skins/default/xui/en" --stringsfile "strings.xml"
if [ $? -ne 0 ]
then echo $3 >> "$2"
--
GitLab