[Branding] Linux scripts now made from template by cmake

.gitignore

@@ -29,3 +29,9 @@ qtcreator-build/
 /indra/newview/res/viewerRes.rc
 /indra/newview/res/viewerRes_bc.rc
 /indra/newview/English.lproj/InfoPlist.strings
+/indra/newview/linux_tools/handle_secondlifeprotocol.sh
+/indra/newview/linux_tools/install.sh
+/indra/newview/linux_tools/refresh_desktop_app_entry.sh
+/indra/newview/linux_tools/wrapper.sh
+
+

indra/cmake/BuildVersion.cmake

@@ -58,6 +58,21 @@ if (LINUX)
        ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh
        @ONLY
    )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh
+       @ONLY
+   )
 endif (LINUX)
 
 # Compose the version.

indra/newview/linux_tools/client-readme-voice.txt

@@ -11,9 +11,9 @@ groups inside Second Life, with an appropriate headset/microphone.
 Linux Voice Support is currently EXPERIMENTAL and is known to still
 have some compatibility issues.
 
-SINGULARITY MULTI-VOICE
+MULTI-VOICE
 -=-=-=-=-=-=-=-=-=-=-=-
-Singularity multi-voice is an experimental feature that allows you to run multiple
+Multi-voice is an experimental feature that allows you to run multiple
 SLVoice daemons at the same time, in order to do this, the debug setting VoiceMultiInstance
 must be TRUE, this allows multiple instances of the viewer to run concurrently and
 each connect to voice.

indra/newview/linux_tools/handle_secondlifeprotocol.sh → indra/newview/linux_tools/handle_secondlifeprotocol.sh.in

@@ -13,5 +13,5 @@ fi
 RUN_PATH=`dirname "$0" || echo .`
 cd "${RUN_PATH}"
 
-exec ./singularity -url \'"${URL}"\'
+exec ./@VIEWER_BRANDING_ID@ -url \'"${URL}"\'
 

indra/newview/linux_tools/install.sh → indra/newview/linux_tools/install.sh.in

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Install Singularity Viewer. This script can install the viewer both
+# Install @VIEWER_CHANNEL@. This script can install the viewer both
 # system-wide and for an individual user.
 
 VT102_STYLE_NORMAL='\E[0m'
@@ -48,8 +48,8 @@ function warn()
 function homedir_install()
 {
     warn "You are not running as a privileged user, so you will only be able"
-    warn "to install Singularity Viewer in your home directory. If you"
-    warn "would like to install Singularity Viewer system-wide, please run"
+    warn "to install @VIEWER_CHANNEL@ in your home directory. If you"
+    warn "would like to install @VIEWER_CHANNEL@ system-wide, please run"
     warn "this script as the root user, or with the 'sudo' command."
     echo
 
@@ -58,13 +58,13 @@ function homedir_install()
 	exit 0
     fi
 
-    install_to_prefix "$HOME/.singularity-install"
-    $HOME/.singularity-install/refresh_desktop_app_entry.sh
+    install_to_prefix "$HOME/.@VIEWER_BRANDING_ID@-install"
+    $HOME/.@VIEWER_BRANDING_ID@-install/refresh_desktop_app_entry.sh
 }
 
 function root_install()
 {
-    local default_prefix="/opt/singularity-install"
+    local default_prefix="/opt/@VIEWER_BRANDING_ID@-install"
 
     echo -n "Enter the desired installation directory [${default_prefix}]: ";
     read

indra/newview/linux_tools/refresh_desktop_app_entry.sh → indra/newview/linux_tools/refresh_desktop_app_entry.sh.in

@@ -12,10 +12,10 @@ function install_desktop_entry()
 
     local desktop_entry="\
 [Desktop Entry]\n\
-Name=Singularity\n\
+Name=@VIEWER_BRANDING_ID@\n\
 Comment=Client for Online Virtual Worlds, such as Second Life\n\
-Exec=${installation_prefix}/singularity\n\
-Icon=${installation_prefix}/singularity_icon.png\n\
+Exec=${installation_prefix}/@VIEWER_BRANDING_ID@\n\
+Icon=${installation_prefix}/@VIEWER_BRANDING_ID@_icon.png\n\
 Terminal=false\n\
 Type=Application\n\
 Categories=Application;Network;\n\
@@ -24,7 +24,7 @@ X-Desktop-File-Install-Version=3.0"
 
     echo " - Installing menu entries in ${desktop_entries_dir}"
     mkdir -vp "${desktop_entries_dir}"
-    echo -e $desktop_entry > "${desktop_entries_dir}/singularity-viewer.desktop" || "Failed to install application menu!"
+    echo -e $desktop_entry > "${desktop_entries_dir}/@VIEWER_BRANDING_ID@-viewer.desktop" || "Failed to install application menu!"
 }
 
 if [ "$UID" == "0" ]; then