diff --git a/Makefile b/Makefile index 02daf83..4e437b6 100644 --- a/Makefile +++ b/Makefile @@ -4,18 +4,17 @@ target/release/bRAC: cargo build -r install: target/release/bRAC - mkdir -p ~/.local - mkdir -p ~/.local/bin - mkdir -p ~/.local/share - cp $< ~/.local/bin/bRAC - chmod +x ~/.local/bin/bRAC - mkdir ~/.local/share/bRAC -p - cp misc/bRAC.png ~/.local/share/bRAC/icon.png + mkdir -p /usr/bin + mkdir -p /usr/share + cp $< /usr/bin/bRAC + chmod +x /usr/bin/bRAC + cp misc/bRAC.png /usr/share/pixmaps/ru.themixray.bRAC.png chmod +x misc/create-desktop.sh - ./misc/create-desktop.sh > ~/.local/share/applications/ru.themixray.bRAC.desktop + ./misc/create-desktop.sh > /usr/share/applications/ru.themixray.bRAC.desktop uninstall: - rm -rf ~/.config/bRAC ~/.local/share/bRAC - rm -f ~/.local/bin/bRAC ~/.local/share/applications/ru.themixray.bRAC.desktop + rm -f /usr/bin/bRAC + rm -f /usr/share/applications/ru.themixray.bRAC.desktop + rm -f /usr/share/pixmaps/ru.themixray.bRAC.png package: ./misc/build.sh diff --git a/misc/create-desktop.sh b/misc/create-desktop.sh index 1d683ad..74c92f1 100755 --- a/misc/create-desktop.sh +++ b/misc/create-desktop.sh @@ -7,8 +7,8 @@ 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 "Icon=ru.themixray.bRAC" +echo "Exec=/usr/bin/bRAC" echo "Categories=Network;" echo "StartupNotify=true" echo "Terminal=false" diff --git a/misc/install.sh b/misc/install.sh new file mode 100755 index 0000000..8d60088 --- /dev/null +++ b/misc/install.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +mkdir -p /usr/bin +mkdir -p /usr/share +mkdir -p /usr/share/pixmaps + +cp misc/bRAC-gnotif /usr/bin/bRAC +chmod +x /usr/bin/bRAC + +cp misc/bRAC.png /usr/share/pixmaps/ru.themixray.bRAC.png +chmod +x misc/create-desktop.sh +./misc/create-desktop.sh > /usr/share/applications/ru.themixray.bRAC.desktop diff --git a/misc/uninstall.sh b/misc/uninstall.sh new file mode 100755 index 0000000..f83914a --- /dev/null +++ b/misc/uninstall.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +rm -rf /usr/bin/bRAC \ + /usr/share/pixmaps/ru.themixray.bRAC.png \ + /usr/share/applications/ru.themixray.bRAC.desktop diff --git a/misc/user-install.sh b/misc/user-install.sh deleted file mode 100755 index b308dda..0000000 --- a/misc/user-install.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -mkdir -p ~/.local -mkdir -p ~/.local/bin -mkdir -p ~/.local/share -mkdir -p ~/.local/share/bRAC - -cp misc/bRAC-gnotif ~/.local/bin/bRAC -chmod +x ~/.local/bin/bRAC - -cp misc/bRAC.png ~/.local/share/bRAC/icon.png -chmod +x misc/create-desktop.sh -./misc/create-desktop.sh > ~/.local/share/applications/ru.themixray.bRAC.desktop diff --git a/misc/user-uninstall.sh b/misc/user-uninstall.sh deleted file mode 100755 index 472fdaa..0000000 --- a/misc/user-uninstall.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -rm -rf ~/.local/bin/bRAC \ - ~/.config/bRAC \ - ~/.local/share/bRAC \ - ~/.local/share/applications/ru.themixray.bRAC.desktop