From 88f26ff92b1e97b0d57d568d0f6e6626887848ea Mon Sep 17 00:00:00 2001
From: sloumdrone <brian.michael.evans@gmail.com>
Date: Thu, 14 Nov 2019 20:28:48 -0800
Subject: [PATCH 1/7] Adds bombadillo desktop settings and icon

---
 bombadillo-icon.png | Bin 0 -> 1351 bytes
 bombadillo.desktop  |   6 ++++++
 2 files changed, 6 insertions(+)
 create mode 100644 bombadillo-icon.png
 create mode 100644 bombadillo.desktop

diff --git a/bombadillo-icon.png b/bombadillo-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f10bd27eeb88abed32a57c3981de8aeec42a12f
GIT binary patch
literal 1351
zcmV-N1-SZ&P)<h;3K|Lk000e1NJLTq003kF003kN0ssI2|9}Dm0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CJn4t5Z6$WWauh)QwPDionYs1;guFuC*#ni!H4
z7e~Rh;NZt%)xpJCR|i)?5c~jfadlF3krMxx6k5c1aNLh~_a1le0HIN3n$<N9Xu54?
zQb{qFUlBvE=tBfSB#@AqWz0%a8ouM}9s$1I#d((hxj#q0TCf-p5Q%4)VcNv&#EDJY
z;Ji;9Wo20<J|`YC>4L<MTvt4P<6LrC;F(b~o0%hy5{sn{RyvrKO^tYpIHqbk<qJ8F
zRnA+SwQ7yE?#W*mF6hfkT&FpV6c(@u2_h8KP(c+o;<W0dSjf<R(#JpK`XzEH<f?#?
zV;&pOAiI9>Klt6PRh*pglEO)#`^9lSMu5;R(5ySo_p#$NPk`VvaHY5X8x3Iklk|F9
ziyZ-xZQ$a%ttorJ<qk0TWXPuMN<o@Ju?W1M(KqFRfm@(=)$6UbkJASrOI@XJfP+I|
zv_#o!KJV`7?Csw(t^R%hy{B@;nanru00009a7bBm000XU000XU0RWnu7ytkO2XskI
zMF-;x4+IGcMX4A-0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbQ
zF-b&0RCwC$+)r!NU=RlIXWlp6t*yIMEY`Myf1p?uL{BPS^q`_e@n}ImfFHo4coM;{
zARYu!QM4$C;zbYkAPAnUsK{3EP*5w?*6wbyGhRxK(u8&C;%@WIHDr_bw=<I=36a76
zelY3_M*?CIi&(@W7O_Y`EMgIhSi~Y035Z23ViAj2#3BK)h(#=75sO$PAQrLycLWXZ
znLnq&4qI|lI3d-`j+w<WWDtv3#3B~4h{Yflv51vrEHPr$9Tv)p#0r{%RgV1|!|?mf
zZ&6o(biq`t44akOq}84~oya^E$^anSkUMF?kjB$jV3Grh<_Ca%wP;eRx17Cg4=i6S
z6dGjSZ*JYvo1!-&!{|Jtew`tuA_Z;@g1u&)q7#zQ%<9-}ZhgH?UOJFJrV_aDW~+NO
zrNP%PwU}bL!|D!O7O@%{H_&-p(Mzm4xeCaQwsdj@&HecrYE#f@XH~e>aQ*6vsb{lY
z!)|YLS;JC<ucdm=q4dYaH#lwig9@LJT&v(mEV?Zj!m@dk$DBS{V$IQYLE!QSG;x+0
zvIs4T)s&tUm1Ie&h0?qu_?dh{eQfaYyqiOqJc7ES$sn=f4efJUp-CUH;>q<T6>E(V
zE1p?t9MZ+iigN^MnWeMD`lHZNi}Wk8;z!+>R)$t`#EMOxo04mAM(~3Tez693n%|H(
z!Rx1t4W-hNye*IXDN8wQ^iHyc6%1Mag1S9_SCec-=Xv!5iB)E^s6B37tY+PH2sT@A
z)^t?t8+1mHGv8}|EzGCw6~1(+Aahs?dD~;?fyY8BrT1-}MKspZx8YmnBCV+0bvA>H
zVQC{fRmPn@&EC_U@_naM|FUdDb=*Z)+u*t3a$_0vg_JM3=zU#_w<;=+TzI8D-i=u1
z2Cs9lDFCQkbkPaR9Wqz2q-u@cyYL3|W81t%vfNnHzgJ#+AoCB!k65tFWG#HRnZf2o
zze7Jr^h~UT_6p&5O51RBAl3?tpfyj+AF<rgrrf9rUrBULRuq<W!Syr+%dG|)eTd64
z<kgT3o>;^p7K2#CA{McTMJxufh(#=75sO$1ViAj2#3I%TjbDJh>?<%{{G0#)002ov
JPDHLkV1iW)ay<Y5

literal 0
HcmV?d00001

diff --git a/bombadillo.desktop b/bombadillo.desktop
new file mode 100644
index 0000000..1f4dd7a
--- /dev/null
+++ b/bombadillo.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Bombadillo
+Type=Application
+Terminal=true
+Exec=bombadillo
+Icon=bombadillo-icon

From f49f8bebdd53eac3a62dfff284e11474be978918 Mon Sep 17 00:00:00 2001
From: sloumdrone <brian.michael.evans@gmail.com>
Date: Thu, 14 Nov 2019 21:46:28 -0800
Subject: [PATCH 2/7] Adds desktop entry and icon, plus build target for
 makefile

---
 Makefile           | 11 ++++++++++-
 bombadillo.desktop |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d8d2c33..fedcd27 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ build:
 	${GOCMD} build ${LDFLAGS} -o ${BINARY}
 
 .PHONY: install
-install: install-bin install-man clean
+install: install-bin install-man install-desktop clean
 
 .PHONY: install-man
 install-man: bombadillo.1
@@ -34,6 +34,13 @@ install-man: bombadillo.1
 	install -d ${DESTDIR}${MAN1DIR}
 	install -m 0644 ./bombadillo.1.gz ${DESTDIR}${MAN1DIR}
 
+.PHONY: install-desktop
+install-desktop:
+	install -d ${DESTDIR}${DATAROOTDIR}/applications
+	install -m 0644 ./bombadillo.desktop ${DESTDIR}${DATAROOTDIR}/applications
+	install -d ${DESTDIR}${DATAROOTDIR}/pixmaps
+	install -m 0644 ./bombadillo-icon.png ${DESTDIR}${DATAROOTDIR}/pixmaps
+
 .PHONY: install-bin
 install-bin: build
 	install -d ${DESTDIR}${BINDIR}
@@ -48,6 +55,8 @@ clean:
 uninstall: clean
 	rm -f ${DESTDIR}${MAN1DIR}/bombadillo.1.gz
 	rm -f ${DESTDIR}${BINDIR}/${BINARY}
+	rm -f ${DESTDIR}${DATAROOTDIR}/applications/bombadillo.desktop
+	rm -f ${DESTDIR}${DATAROOTDIR}/pixmaps/bombadillo-icon.png
 
 .PHONY: test
 test: clean build
diff --git a/bombadillo.desktop b/bombadillo.desktop
index 1f4dd7a..6300fe7 100644
--- a/bombadillo.desktop
+++ b/bombadillo.desktop
@@ -1,6 +1,9 @@
 [Desktop Entry]
-Name=Bombadillo
 Type=Application
+Name=Bombadillo
+GenericName=Non-Web Browser
+Comment=View gopher, gemini, finger, telnet, http(s) sites over the internet
 Terminal=true
+Categories=Network;Application;WebBrowser;ConsoleOnly;
 Exec=bombadillo
 Icon=bombadillo-icon

From 57ab1b085e73413a9ce3b4d6c49c7a246e6915a7 Mon Sep 17 00:00:00 2001
From: sloumdrone <brian.michael.evans@gmail.com>
Date: Thu, 14 Nov 2019 22:20:12 -0800
Subject: [PATCH 3/7] Adds a default entry in the mime db for gopher, gemini,
 and finger

---
 Makefile           | 3 +++
 bombadillo.desktop | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fedcd27..7da7f86 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,9 @@ install-desktop:
 	install -m 0644 ./bombadillo.desktop ${DESTDIR}${DATAROOTDIR}/applications
 	install -d ${DESTDIR}${DATAROOTDIR}/pixmaps
 	install -m 0644 ./bombadillo-icon.png ${DESTDIR}${DATAROOTDIR}/pixmaps
+	xdg-mime default bombadillo.desktop x-scheme-handler/gopher
+	xdg-mime default bombadillo.desktop x-scheme-handler/gemini
+	xdg-mime default bombadillo.desktop x-scheme-handler/finger
 
 .PHONY: install-bin
 install-bin: build
diff --git a/bombadillo.desktop b/bombadillo.desktop
index 6300fe7..80b5c21 100644
--- a/bombadillo.desktop
+++ b/bombadillo.desktop
@@ -5,5 +5,6 @@ GenericName=Non-Web Browser
 Comment=View gopher, gemini, finger, telnet, http(s) sites over the internet
 Terminal=true
 Categories=Network;Application;WebBrowser;ConsoleOnly;
-Exec=bombadillo
+Exec=bombadillo %U
 Icon=bombadillo-icon
+MimeType=x-scheme-handler/gopher;x-scheme-handler/gemini;x-scheme-handler/finger;

From 35c580c9d0130c35c6ac8541e6185e88ca5265fd Mon Sep 17 00:00:00 2001
From: Brian Evans <bevans@formulafolios.com>
Date: Fri, 15 Nov 2019 14:05:10 -0800
Subject: [PATCH 4/7] Removes protocol handler association for non-linux
 systems

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 7da7f86..c91c5a0 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,9 @@ install-man: bombadillo.1
 
 .PHONY: install-desktop
 install-desktop:
+ifeq ($(shell uname), Linux)
+	# These steps will not work on Darwin, Plan9, or Windows
+	# They would likely work on BSD systems
 	install -d ${DESTDIR}${DATAROOTDIR}/applications
 	install -m 0644 ./bombadillo.desktop ${DESTDIR}${DATAROOTDIR}/applications
 	install -d ${DESTDIR}${DATAROOTDIR}/pixmaps
@@ -43,6 +46,9 @@ install-desktop:
 	xdg-mime default bombadillo.desktop x-scheme-handler/gopher
 	xdg-mime default bombadillo.desktop x-scheme-handler/gemini
 	xdg-mime default bombadillo.desktop x-scheme-handler/finger
+else
+	@echo "* Skipping protocol handler associations and desktop file creation for non-linux system *"
+endif
 
 .PHONY: install-bin
 install-bin: build

From c089041cf8a50cc0474fc152b9afa05764bd4eb7 Mon Sep 17 00:00:00 2001
From: sloumdrone <brian.michael.evans@gmail.com>
Date: Sun, 17 Nov 2019 17:01:38 -0800
Subject: [PATCH 5/7] Makes xdg-mime fail without halting the makefile

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7da7f86..0eadfe3 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,9 @@ install-desktop:
 	install -m 0644 ./bombadillo.desktop ${DESTDIR}${DATAROOTDIR}/applications
 	install -d ${DESTDIR}${DATAROOTDIR}/pixmaps
 	install -m 0644 ./bombadillo-icon.png ${DESTDIR}${DATAROOTDIR}/pixmaps
-	xdg-mime default bombadillo.desktop x-scheme-handler/gopher
-	xdg-mime default bombadillo.desktop x-scheme-handler/gemini
-	xdg-mime default bombadillo.desktop x-scheme-handler/finger
+	-xdg-mime default bombadillo.desktop x-scheme-handler/gopher
+	-xdg-mime default bombadillo.desktop x-scheme-handler/gemini
+	-xdg-mime default bombadillo.desktop x-scheme-handler/finger
 
 .PHONY: install-bin
 install-bin: build

From 82b47d8c86efc8a380faefd5077ea907c92cdab7 Mon Sep 17 00:00:00 2001
From: sloumdrone <brian.michael.evans@gmail.com>
Date: Fri, 22 Nov 2019 19:17:21 -0800
Subject: [PATCH 6/7] Removes a deprecated category from desktop file

---
 bombadillo.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bombadillo.desktop b/bombadillo.desktop
index 80b5c21..3ca2531 100644
--- a/bombadillo.desktop
+++ b/bombadillo.desktop
@@ -4,7 +4,7 @@ Name=Bombadillo
 GenericName=Non-Web Browser
 Comment=View gopher, gemini, finger, telnet, http(s) sites over the internet
 Terminal=true
-Categories=Network;Application;WebBrowser;ConsoleOnly;
+Categories=Network;WebBrowser;ConsoleOnly;
 Exec=bombadillo %U
 Icon=bombadillo-icon
 MimeType=x-scheme-handler/gopher;x-scheme-handler/gemini;x-scheme-handler/finger;

From 0c0ce2ceb17ea9aed3eea3d8de7e7ec3cfb97600 Mon Sep 17 00:00:00 2001
From: asdf <asdf@rawtext.club>
Date: Sun, 24 Nov 2019 08:19:38 +1100
Subject: [PATCH 7/7] Use update-desktop-database instead of xdg-mime

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 631b32a..5759793 100644
--- a/Makefile
+++ b/Makefile
@@ -43,9 +43,7 @@ ifeq ($(shell uname), Linux)
 	install -m 0644 ./bombadillo.desktop ${DESTDIR}${DATAROOTDIR}/applications
 	install -d ${DESTDIR}${DATAROOTDIR}/pixmaps
 	install -m 0644 ./bombadillo-icon.png ${DESTDIR}${DATAROOTDIR}/pixmaps
-	-xdg-mime default bombadillo.desktop x-scheme-handler/gopher
-	-xdg-mime default bombadillo.desktop x-scheme-handler/gemini
-	-xdg-mime default bombadillo.desktop x-scheme-handler/finger
+	-update-desktop-database 2> /dev/null
 else
 	@echo "* Skipping protocol handler associations and desktop file creation for non-linux system *"
 endif
@@ -66,6 +64,8 @@ uninstall: clean
 	rm -f ${DESTDIR}${BINDIR}/${BINARY}
 	rm -f ${DESTDIR}${DATAROOTDIR}/applications/bombadillo.desktop
 	rm -f ${DESTDIR}${DATAROOTDIR}/pixmaps/bombadillo-icon.png
+	-update-desktop-database 2> /dev/null
+
 
 .PHONY: test
 test: clean build