More fixes

indra/newview/linux_tools/refresh_desktop_app_entry.sh

@@ -21,7 +21,7 @@ function install_desktop_entry()
 {
 	local installation_prefix="${1}"
 
-	desktoppath="${installation_prefix}/${VIEWERNAME,,}-${CHANNELNAME}-viewer.desktop"
+	desktoppath="${installation_prefix}/${VIEWERNAME,,}-${CHANNELNOBREAK,,}-viewer.desktop"
 	cat >"${desktoppath}" <<desktopfile || print "Warning: Could not write $desktoppath"s
 [Desktop Entry]
 Version=1.4
@@ -59,7 +59,7 @@ desktopfile
 	print "Installing menu entries via XDG..."
 	xdg-icon-resource install --novendor --size 256 "${install_prefix}/${VIEWERNAME,,}_icon.png" "${VIEWERNAME}"-"${CHANNELNOBREAK}"-Viewer
 	#NOTE: Above command takes the path to the icon to install && The name of the icon to be used by XDG. This should always be in the format of "x-Viewer" to avoid potential naming conflicts, as per XDG spec.
-	xdg-desktop-menu install --novendor "${installation_prefix}"/"${VIEWERNAME,,}"-"${CHANNELNOBREAK}"-viewer.desktop
+	xdg-desktop-menu install --novendor "${installation_prefix}"/"${VIEWERNAME,,}"-"${CHANNELNOBREAK,,}"-viewer.desktop
 }
 
 CHANNELNAME=$(echo "${CHANNELNAME}" | xargs) #Trim leading and / or tailing whitespace from CHANNELNAME