From b46dd0adbc1acaa8f7f47b17e52752186023ac45 Mon Sep 17 00:00:00 2001
From: Rusty Wagner <rusty.wagner@gmail.com>
Date: Wed, 8 Jun 2022 15:48:23 -0400
Subject: Fix linux-setup.sh to use proper naming of .desktop file, fixes
 Wayland app name

---
 scripts/linux-setup.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/linux-setup.sh b/scripts/linux-setup.sh
index 9117ee8a..1ae10e65 100755
--- a/scripts/linux-setup.sh
+++ b/scripts/linux-setup.sh
@@ -12,6 +12,8 @@
 setvars()
 {
 	APP="binaryninja"
+	APPID="com.vector35.binaryninja"
+	NAME="Binary Ninja"
 	FILECOMMENT="Binary Ninja Analysis Database"
 	APPCOMMENT="Binary Ninja: A Reverse Engineering Platform"
 	BNPATH=$(realpath "$(dirname "$(readlink -f "$0")")/..")
@@ -26,7 +28,8 @@ setvars()
 		SHARE="${HOME}/.local/share" #For user only
 		SUDO=""                      #For user only
 	fi
-	DESKTOPFILE="${SHARE}/applications/${APP}.desktop"
+	DESKTOPFILE="${SHARE}/applications/${APPID}.desktop"
+	OLDDESKTOPFILE="${SHARE}/applications/${APP}.desktop"
 	MIMEFILE="${SHARE}/mime/packages/application-x-${APP}.xml"
 	IMAGEFILE="${SHARE}/pixmaps/application-x-${APP}.png"
 }
@@ -87,7 +90,7 @@ createdesktopfile()
 	# Desktop File
 	read -d '' DESKTOP << EOF
 [Desktop Entry]
-Name=${APP}
+Name=${NAME}
 Exec=${EXEC// /\\\\ } %u
 MimeType=application/x-${APP};x-scheme-handler/${APP};
 Icon=${PNG// /\\\\s}
@@ -105,6 +108,10 @@ EOF
 	echo "${DESKTOP}" | $SUDO tee ${DESKTOPFILE} >/dev/null
 	echo "${MIMEAPPS}" | $SUDO tee -a ${MIMEFILE} >/dev/null
 	$SUDO chmod +x ${DESKTOPFILE}
+	if [ -f ${OLDDESKTOPFILE} ]
+	then
+		rm ${OLDDESKTOPFILE}
+	fi
 	GNOMEVERSION=`gnome-shell --version|awk '{print $3}'`
 	MINVERSION=3.36
 	# This check is dumb. Thanks Gnome for not only imitating the worst
@@ -150,7 +157,7 @@ createmime()
 
 addtodesktop()
 {
-	cp "$DESKTOPFILE" "${HOME}/Desktop"
+	cp "$DESKTOPFILE" "${HOME}/Desktop/${APP}.desktop"
 }
 
 uninstall()
-- 
cgit v1.3.1