From af56d43c2bd710964b5147d6c628b9998777c16e Mon Sep 17 00:00:00 2001 From: Yonatan Avhar Date: Sat, 7 May 2022 14:09:00 +0300 Subject: [PATCH 1/4] Add btop.desktop --- btop.desktop | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 btop.desktop diff --git a/btop.desktop b/btop.desktop new file mode 100644 index 0000000..489c436 --- /dev/null +++ b/btop.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=btop +GenericName=System Monitor +Comment=Resource monitor that shows usage and stats for processor, memory, disks, network and processes. +Icon=btop +Exec=btop +Terminal=true +Categories=System;Monitor;ConsoleOnly; +Keywords=system;process;task + From 41148527b9c3caa3ac8c863ccba7a5d561173539 Mon Sep 17 00:00:00 2001 From: Yonatan Avhar Date: Sat, 7 May 2022 14:48:03 +0300 Subject: [PATCH 2/4] Add desktop icon svg and png --- Img/icon.png | Bin 0 -> 1060 bytes Img/icon.svg | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 Img/icon.png create mode 100644 Img/icon.svg diff --git a/Img/icon.png b/Img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cba489022ebcd78cafd2cea5228180d592a145a4 GIT binary patch literal 1060 zcmV+<1l#+GP)D zu&_4|g2;j=7jGgG1ChX*$Yvu3IwXe{;$)KU`sE=p%x33Db#~%RlP?TY!>jjRf9dz5 zUJZD_!G{jqMSOhx_k(;=1EWUi35275fTg9SPXUAw50;mgzb&diaspYFeVOMujYi`E zP?*5TL+Ie(fGbz7V2m;6(H}X1BuTK=o?Cz91fCRLIgok{g?&mG3L26O_`gUd%?%=P&;w8T1{3~R<8Bi^CH}H@J2UTyWJ*95@u&- zy?vHG2TD)CD}>e|*Fxk*h>COWu}1bqo)g@^PXNs+_^Y3--yzPWv<{@TmXE8|Q<)Wl zz!>s8C(AOgvypEOR6^$}q3b?C)tm#Z0YV4Q4m8$Lt=eZAU|k5LlyK7Z2jOyr&_$zO zub-}KwOS$Fu^=!%KhOUD{(qrEmSx^V#)3eWWz5XX{H>Jw9**CF*7|E7-LW75ptasx zTU&dtsNUsB;uMaQl!sb~TDLy%tCU#Jd0@d9raOMWY7Db!N+f0d6L|9jxaa-!_zyG@ z*7nS*yJ5(YCxQ2^CG6+}Zz%=4y8z8S_>6)CN*_X{Cor@s)ND4r_EnPv4iCG^c5Aik z3sh|X5=2wI44YiDFt!)^Fs^1;~6ZClV8YYb~3$0d*>FMd0e0&a-KomvW z8yg$f`t5n9&p?x98EKj_H8th!v-CModIDY{^ar%Hln45FAb+fpy{;7D_BIlpz7D_i zv$YNl6$IKrXszXkO663h0bwmlDTEMSmwjFYEKEvk<4O;C)j7!X<0ZT@&}qj-^ud`1 z7@d3zA$qxc1eYU(E*cXP6J6In7z+Z8MuWqS=9cF<)sA7mAI5@!Qi?c^_l+?>0Yp)R z*7~lG?pP22&|2?oZEd|>RPS;mv4EeqP6rVtTkt5 zep5=_$n%_|9v58ag>w#LOtJEFg3^aj=?N67Le4qjI3|js!JGdl6nX=dN`-U&p*|2n e5O|$^&f;Gh2#l5_P|d3V0000 + + + + + + + + + + + + + + + + + + + + + + + + + + From fee972364b0e373f7099a29312dee8de48c7648d Mon Sep 17 00:00:00 2001 From: Yonatan Avhar Date: Sat, 7 May 2022 15:01:48 +0300 Subject: [PATCH 3/4] Update makefile to install/remove icons and desktop entry --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile b/Makefile index 37bde6b..5ec3a45 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,8 @@ else endif PREFIX ?= /usr/local +DESKTOPENTRY ?= /usr/share/applications/btop.desktop +ICONDIR ?= /usr/share/icons/hicolor #? Detect PLATFORM and ARCH from uname/gcc if not set PLATFORM ?= $(shell uname -s || echo unknown) @@ -212,6 +214,11 @@ install: @cp -p README.md $(DESTDIR)$(PREFIX)/share/btop @printf "\033[1;92mInstalling themes to: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop/themes\033[0m\n" @cp -pr themes $(DESTDIR)$(PREFIX)/share/btop + @printf "\033[1;92mInstalling desktop entry to: \033[1;97m$(DESKTOPENTRY)\n" + @cp -p btop.desktop $(DESKTOPENTRY) + @printf "\033[1;92mInstalling icons to: \033[1;97m$(ICONDIR)\n" + @cp -p Img/icon.png $(ICONDIR)/48x48/apps/btop.png + @cp -p Img/icon.svg $(ICONDIR)/scalable/apps/btop.svg #? Set SUID bit for btop as $SU_USER in $SU_GROUP @@ -227,6 +234,12 @@ uninstall: @rm -rf $(DESTDIR)$(PREFIX)/bin/btop @printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop\033[0m\n" @rm -rf $(DESTDIR)$(PREFIX)/share/btop + @printf "\033[1;91mRemoving: \033[1;97m$(DESKTOPENTRY)\033[0m\n" + @rm -rf $(DESKTOPENTRY) + @printf "\033[1;91mRemoving: \033[1;97m$(ICONDIR)/48x48/btop.png\033[0m\n" + @rm -rf $(ICONDIR)/48x48/apps/btop.png + @printf "\033[1;91mRemoving: \033[1;97m$(ICONDIR)/scalable/btop.svg\033[0m\n" + @rm -rf $(ICONDIR)/scalable/apps/btop.svg #? Pull in dependency info for *existing* .o files -include $(OBJECTS:.$(OBJEXT)=.$(DEPEXT)) From b9cb628f9ca5a277f326677335ce728f5ed1d739 Mon Sep 17 00:00:00 2001 From: Yonatan Avhar Date: Sun, 8 May 2022 14:37:48 +0300 Subject: [PATCH 4/4] Fix makefile to install to /usr/local instead of /usr --- Makefile | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 5ec3a45..d1bc95d 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,6 @@ else endif PREFIX ?= /usr/local -DESKTOPENTRY ?= /usr/share/applications/btop.desktop -ICONDIR ?= /usr/share/icons/hicolor #? Detect PLATFORM and ARCH from uname/gcc if not set PLATFORM ?= $(shell uname -s || echo unknown) @@ -214,11 +212,15 @@ install: @cp -p README.md $(DESTDIR)$(PREFIX)/share/btop @printf "\033[1;92mInstalling themes to: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop/themes\033[0m\n" @cp -pr themes $(DESTDIR)$(PREFIX)/share/btop - @printf "\033[1;92mInstalling desktop entry to: \033[1;97m$(DESKTOPENTRY)\n" - @cp -p btop.desktop $(DESKTOPENTRY) - @printf "\033[1;92mInstalling icons to: \033[1;97m$(ICONDIR)\n" - @cp -p Img/icon.png $(ICONDIR)/48x48/apps/btop.png - @cp -p Img/icon.svg $(ICONDIR)/scalable/apps/btop.svg + @printf "\033[1;92mInstalling desktop entry to: \033[1;97m$(DESTDIR)$(PREFIX)/share/applications/btop.desktop\n" + @mkdir -p $(DESTDIR)$(PREFIX)/share/applications/ + @cp -p btop.desktop $(DESTDIR)$(PREFIX)/share/applications/btop.desktop + @printf "\033[1;92mInstalling PNG icon to: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png\n" + @mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps + @cp -p Img/icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png + @printf "\033[1;92mInstalling SVG icon to: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg\n" + @mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps + @cp -p Img/icon.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg #? Set SUID bit for btop as $SU_USER in $SU_GROUP @@ -234,12 +236,12 @@ uninstall: @rm -rf $(DESTDIR)$(PREFIX)/bin/btop @printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop\033[0m\n" @rm -rf $(DESTDIR)$(PREFIX)/share/btop - @printf "\033[1;91mRemoving: \033[1;97m$(DESKTOPENTRY)\033[0m\n" - @rm -rf $(DESKTOPENTRY) - @printf "\033[1;91mRemoving: \033[1;97m$(ICONDIR)/48x48/btop.png\033[0m\n" - @rm -rf $(ICONDIR)/48x48/apps/btop.png - @printf "\033[1;91mRemoving: \033[1;97m$(ICONDIR)/scalable/btop.svg\033[0m\n" - @rm -rf $(ICONDIR)/scalable/apps/btop.svg + @printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/share/applications/btop.desktop\033[0m\n" + @rm -rf $(DESTDIR)$(PREFIX)/share/applications/btop.desktop + @printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png\033[0m\n" + @rm -rf $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/btop.png + @printf "\033[1;91mRemoving: \033[1;97m$(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg\033[0m\n" + @rm -rf $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/btop.svg #? Pull in dependency info for *existing* .o files -include $(OBJECTS:.$(OBJEXT)=.$(DEPEXT))