From 0ef9605db7eda150ceba8b2fe3cf0cce8fb11f08 Mon Sep 17 00:00:00 2001 From: JennaHuntsman <jenna.salem.sf@gmail.com> Date: Sun, 18 Dec 2022 17:55:17 -0500 Subject: [PATCH] Hopefully cmake might work --- indra/newview/linux_tools/refresh_desktop_app_entry.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/linux_tools/refresh_desktop_app_entry.sh b/indra/newview/linux_tools/refresh_desktop_app_entry.sh index 5df4827d827..3013b817e34 100755 --- a/indra/newview/linux_tools/refresh_desktop_app_entry.sh +++ b/indra/newview/linux_tools/refresh_desktop_app_entry.sh @@ -12,8 +12,8 @@ CHANNELNAME="${CHANNEL_TYPE} ${PROJECT_NAME}" #Use cmake to autofill the channel CHANNELNOBREAK=$(echo $CHANNELNAME | tr " " "-") #Store a version of the channel name without any spaces to prevent breakage with some functions. Not filled by cmake to ensure consistency in it's output. -CHANNELNAME="{CHANNELNAME=Test}" #THIS CAN BE BLANK! Store the viewer's channel (i.e. alpha, beta, etc.) as a variable, for portability. This should be correctly capitalized. Release versions should leave this blank, so the DE will show just VIEWERNAME, not VIEWERNAME CHANNELNAME -# CHANNELNAME="@RELEASE_CHANNEL@" #TODO: Make cmake handle channel name autofill +# CHANNELNAME="{CHANNELNAME=Test}" #THIS CAN BE BLANK! Store the viewer's channel (i.e. alpha, beta, etc.) as a variable, for portability. This should be correctly capitalized. Release versions should leave this blank, so the DE will show just VIEWERNAME, not VIEWERNAME CHANNELNAME +CHANNELNAME="@VIEWER_CHANNEL@" #TODO: Make cmake handle channel name autofill SCRIPTSRC="$(readlink -f "$0" || echo "$0")" RUN_PATH="$(dirname "${SCRIPTSRC}" || echo .)" -- GitLab