Skip to content
Snippets Groups Projects
Commit cb21a859 authored by JennaHuntsman's avatar JennaHuntsman
Browse files

Fix an oops which could cause the desktop entry to not install.

parent eb2fd7eb
No related branches found
No related tags found
No related merge requests found
......@@ -4,13 +4,15 @@ VIEWERNAME="@VIEWER_CHANNEL_BASE@" #This should be the viewer's canonical base n
CHANNELNAME="@VIEWER_CHANNEL_TYPE@ @VIEWER_PROJECT_CODENAME@" #Use cmake to autofill the channel type (alpha, beta, release), and any project codename.
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.
SCRIPTSRC="$(readlink -f "$0" || echo "$0")"
RUN_PATH="$(dirname "${SCRIPTSRC}" || echo .)"
install_prefix=$(builtin cd "${RUN_PATH}/.." || exit; pwd) #This is a cleaner way of getting the absolute path for the install directory.
function print() {
log_prefix="${VIEWERNAME}${CHANNELNAME}DesktopIntegration:"
log_prefix="${VIEWERNAME} ${CHANNELNAME} Desktop Integration:"
echo -e "${log_prefix} $*"
}
......@@ -27,7 +29,7 @@ Name=${VIEWERNAME} ${CHANNELNAME}
GenericName=Second Life Viewer
Comment=Client for the Online Virtual World, Second Life
Exec=${installation_prefix}/${VIEWERNAME,,}
Icon="${VIEWERNAME}"-"${CHANNELNAME}"-Viewer
Icon="${VIEWERNAME}"-"${CHANNELNOBREAK}"-Viewer
Terminal=false
Type=Application
Categories=Game;Simulation;
......@@ -55,9 +57,9 @@ desktopfile
# NOTE: DO NOT CHANGE THE "GenericName" FIELD - ONLY CHANGE THE "Name" FIELD. (This is to ensure that searching "Second Life" will show all the viewers installed in a user's system, regardless of their canonical name.)
print "Installing menu entries via XDG..."
xdg-icon-resource install --novendor --size 256 "${install_prefix}/${VIEWERNAME,,}_icon.png" "${VIEWERNAME}"-"${CHANNELNAME}"-Viewer
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,,}"-"${CHANNELNAME}"-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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment