build(make): improve Makefile and other things

Signed-off-by: No <[email protected]>

Makefile

@@ -1,18 +1,46 @@
-SH = bash
+# Author.: Anonymous Planet
+# License.: CC BY-NC 4.0
 
-# Define the scripts
-SCRIPTS = make.sh clean.sh
+##
+# Setup shell
+# https://github.com/QubesOS/qubes-issues/issues/8343
+# if the default shell ($$SHELL) is zsh, else use bash
+##
 
-# Define the target
-.PHONY: all guide clean
+ifneq ($(shell echo $$SHELL | grep -q 'zsh' && echo zsh), zsh)
+    SHELL := /bin/bash # Debian default
+else
+    SHELL := /bin/zsh # Whonix
+endif
+
+
+##
+# Paths
+##
+
+RM                      := rm
+BUILD_DIR				:= ./export
+
+# TODO: Makefile flags
 
-# Default target
 all: clean guide
 
-# Target to run script1
+##
+# target: clean
+##
+
+.PHONY: clean
 clean:
-	$(SH) clean.sh
+	@echo "Our shell: $(SHELL)"
+	$(RM) -rf $(BUILD_DIR)
+	$(RM) -f ./*.md.asc
+	$(RM) -f ./*.txt.asc
+
+##
+# target: guide
+##
 
-# Target to run script2
+.PHONY: guide
 guide:
-	$(SH) make.sh
+	mkdir -p export
+	./make.sh

README.md

@@ -42,7 +42,7 @@ Follow or contact us on:
 Discussion Channels:
 - Matrix room: ```#anonymity:matrix.org``` <https://matrix.to/#/#anonymity:matrix.org>
 - Matrix space: ```#privacy-security-anonymity:matrix.org``` <https://matrix.to/#/#privacy-security-anonymity:matrix.org>
-- Twitter at https://twitter.com/AnonyPla 
+- Twitter at https://twitter.com/AnonyPla
 - Mastodon at https://mastodon.social/@anonymousplanet
 
 Have a good read and feel free to share and/or recommend it!

assets/css/light_style.scss

@@ -22,7 +22,7 @@ td {
   border: 1px solid orange;
 }
 
-td:nth-child(1) {  
+td:nth-child(1) {
   border: 2px solid orange;
   font-weight: bold
 }
@@ -55,33 +55,33 @@ a {
 }
 
 .btn_small {
-  display: inline-block; background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.3), rgba(35, 35, 35, 0.3) 50%, rgba(10, 10, 10, 0.3) 50%, rgba(0, 0, 0, 0.3)); 
-  font-family: Helvetica, Arial, sans-serif; font-weight: bold; 
-  font-size: 13px; 
-  text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.75); 
+  display: inline-block; background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.3), rgba(35, 35, 35, 0.3) 50%, rgba(10, 10, 10, 0.3) 50%, rgba(0, 0, 0, 0.3));
+  font-family: Helvetica, Arial, sans-serif; font-weight: bold;
+  font-size: 13px;
+  text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.75);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05);
   background:#DCDCDC;
   color: #111;
 
   border: 1px solid rgba(0, 0, 0, 0.3);
   border-bottom: 1px solid rgba(0, 0, 0, 0.25);
   border-top: 1px solid rgba(0, 0, 0, 0.35);
-  padding: 1px 5px; 
+  padding: 1px 5px;
   border-radius: 25px;
 }
 
 .btn:hover {
   background: -webkit-linear-gradient(top, rgba(40,40,40,0.4), rgba(35,35,35,0.4) 50%, rgba(10,10,10,0.4) 50%, rgba(0,0,0,0.4));
 }
 
-code.highlighter-rouge { 
+code.highlighter-rouge {
   background:#DCDCDC;
   color: #000000
 }
 
-.highlight { 
+.highlight {
   background:#DCDCDC;
   color: #000000
 }
 
-ul li { list-style-image: url("../images/bullet_light.png"); }
+ul li { list-style-image: url("../images/bullet_light.png"); }

assets/css/style.scss

@@ -25,7 +25,7 @@ td {
   border: 1px solid orange;
 }
 
-td:nth-child(1) {  
+td:nth-child(1) {
   border: 2px solid orange;
   font-weight: bold
 }
@@ -37,15 +37,15 @@ td:nth-child(1) {
 }
 
 .btn_small {
-  display: inline-block; background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.3), rgba(35, 35, 35, 0.3) 50%, rgba(10, 10, 10, 0.3) 50%, rgba(0, 0, 0, 0.3)); 
-  font-family: Helvetica, Arial, sans-serif; font-weight: bold; 
-  font-size: 13px; 
-  text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.75); 
+  display: inline-block; background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.3), rgba(35, 35, 35, 0.3) 50%, rgba(10, 10, 10, 0.3) 50%, rgba(0, 0, 0, 0.3));
+  font-family: Helvetica, Arial, sans-serif; font-weight: bold;
+  font-size: 13px;
+  text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.75);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05);
   border: 1px solid rgba(0, 0, 0, 0.3);
   border-bottom: 1px solid rgba(0, 0, 0, 0.25);
   border-top: 1px solid rgba(0, 0, 0, 0.35);
-  padding: 1px 5px; 
+  padding: 1px 5px;
   border-radius: 25px;
   color: rgba(255, 255, 255, 0.8);
-}
+}