fix makefile install

Makefile

@@ -17,7 +17,7 @@ install: target/release/bRAC
 	chmod +x ~/.local/bin/bRAC
 	mkdir ~/.local/share/bRAC -p
 	cp misc/bRAC.png ~/.local/share/bRAC/icon.png
-	cp misc/bRAC.desktop ~/.local/share/applications/ru.themixray.bRAC.desktop
+	./misc/create-desktop.sh > ~/.local/share/applications/ru.themixray.bRAC.desktop
 uninstall:
 	rm -rf ~/.config/bRAC ~/.local/share/bRAC
 	rm -f ~/.local/share/applications/ru.themixray.bRAC.desktop

misc/bRAC.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=bRAC
-Version=0.1.4
-Type=Application
-Comment=better RAC client
-Icon=~/.local/share/bRAC/icon.png
-Exec=~/.local/bin/bRAC
-Categories=Network;
-StartupNotify=true
-DBusActivatable=true
-Terminal=false
-X-GNOME-UsesNotifications=true

misc/create-desktop.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+version=$(grep -m1 '^version' Cargo.toml | sed -E 's/version *= *"(.*)"/\1/')
+
+echo "[Desktop Entry]"
+echo "Name=bRAC"
+echo "Version=$version"
+echo "Type=Application"
+echo "Comment=better RAC client"
+echo "Icon=$HOME/.local/share/bRAC/icon.png"
+echo "Exec=$HOME/.local/bin/bRAC"
+echo "Categories=Network;"
+echo "StartupNotify=true"
+echo "DBusActivatable=true"
+echo "Terminal=false"
+echo "X-GNOME-UsesNotifications=true"

misc/system-install.bat

@@ -27,4 +27,4 @@ set "v=%TEMP%\_s.vbs"
 >>"%v%" echo l.Save
 wscript "%v%" >nul
 del "%v%" >nul
-exit /b
+exit /b

misc/system-install.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+echo "this script is deprecated, fix it yourself if you wanna to"; exit
+
 if [[ $EUID -ne 0 ]]; then
    echo "This script must be run as root" 
    exit 1
@@ -8,4 +10,4 @@ fi
 cp bRAC /bin/bRAC
 chmod +x /bin/bRAC
 cp ru.themixray.bRAC.png /usr/share/pixmaps
-cp ru.themixray.bRAC.desktop /usr/share/applications
+cp ru.themixray.bRAC.desktop /usr/share/applications

misc/system-uninstall.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+echo "this script is deprecated, fix it yourself if you wanna to"; exit
+
 if [[ $EUID -ne 0 ]]; then
    echo "This script must be run as root" 
    exit 1
@@ -11,4 +13,4 @@ done
 
 rm -f /bin/bRAC
 rm -f /usr/share/pixmaps/ru.themixray.bRAC.png
-rm -f /usr/share/applications/ru.themixray.bRAC.desktop
+rm -f /usr/share/applications/ru.themixray.bRAC.desktop

misc/user-install.sh

@@ -4,4 +4,4 @@ cp bRAC ~/.local/bin/bRAC
 chmod +x ~/.local/bin/bRAC
 mkdir ~/.local/share/bRAC -p
 cp misc/bRAC.png ~/.local/share/bRAC/icon.png
-cp misc/bRAC.desktop ~/.local/share/applications/ru.themixray.bRAC.desktop
+./misc/create-desktop.sh > ~/.local/share/applications/ru.themixray.bRAC.desktop