feat: improve handler detection and suffixes

handlers.available.ubuntu

@@ -0,0 +1,4 @@
+ubuntu
+apt
+binary
+linux

handlers/apt/source

@@ -0,0 +1,7 @@
+#!/bin/sh -e
+sudo apt-get install -y debian-keyring debian-archive-keyring apt-transport-https
+curl="curl --tlsv1.2 -fsSL $1"
+case $1 in
+(*.gpg) sudo $curl -o "$2";;
+(*.key) $curl | sudo gpg --dearmor --yes -o "$2";;
+(*) echo 'Unknown key type' >&2; false;;

handlers/ubuntu/install

@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo apt-get install -y "$@"

instalee

@@ -16,8 +16,8 @@ export dir_home="$(dirname $(find "$INSTALEE_HOME" \
 handlersfile="$dir_home/handlers.available"
 dir_packages="$dir_home/packages"
 
-highlight() { echo "$1" >&2; }
+highlight() { echo $2 "$1" >&2; }
-destress() { echo "$1" >&2; }
+destress() { echo $2 "$1" >&2; }
 
 # Get the content of a file or the output of its execution
 getcontent() {
@@ -77,12 +77,16 @@ installpkg() {
 			local install
 			args="$(getcontent "$pkg_entry")"
 			args="${args:-$1}"
-			install="$(find "$handler" -name "install$ext" | head -1)"
+			installhandler="$(find "$handler" -name "install$ext")"
-			destress " $install $args"
+			if test -n "$installhandler"
-			pkg_entry="$install $args"
+			then pkg_entry="$installhandler $args"
+			else $(find "$handler" -name "${ext#_}") $args
+				pkg_entry="$(find "$handler" -name "install") $1"
+			fi
 		else
-			destress " running unhandled $pkg_entry"
+			destress " running unhandled" -n
 		fi
+		destress " $pkg_entry"
 		$pkg_entry
 		)
 		set +e
@@ -135,7 +139,8 @@ case "$1" in
 			while printf "Handler? (Ctrl-C or Ctrl-D to exit, / to list all) " && read handler
 			do
 				case "$handler" in
-				(/*) find "$dir_packages" "$dir_home/handlers" -type f -not -name "depends*" -printf "%f\n" | sort | uniq | paste -s -d ' ';;
+				(/*) find "$dir_packages" "$dir_home/handlers" -type f -not -name "depends*" -printf "%f\n" |
+					sort | uniq | paste -s -d ' ';;
 				(*) ${EDITOR:-vi} "$dir/$handler";;
 				esac
 			done
@@ -163,9 +168,8 @@ runinstalee() {
 	fi
 }
 
-# TODO Manjaro
 if ! test -f "$handlersfile"
-then copy="$(find "$dir_home" -name "handlers.available.*" -exec sh -c "echo {} | rev | cut -d'.' -f1 | rev | xargs -i% expr $(cat /etc/os-release | grep '^ID=' | cut -d= -f2 | grep . || lsb_release -s -i | tr 'A-Z' 'a-z') : % >/dev/null" \; -a -print)" &&
+then copy=$(ls $({ cat /etc/os-release | grep -E '^ID(_LIKE)?=' | cut -d= -f2 | grep . || lsb_release -s -i | tr 'A-Z' 'a-z'; } | sed 's/^/handlers.available./' | paste -d' ' -s) 2>/dev/null | head -1) &&
 		test -n "$copy" &&
 		echo "Bootstrapping available handlers from $copy" &&
 		cp "$copy" "$handlersfile" || {

packages/caddy/apt

@@ -0,0 +1 @@
+

packages/kubectl/apt

@@ -1,4 +1,7 @@
 #!/bin/sh -e
-sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
+{
+sudo curl --tlsv1.2 -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
 echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list
+sudo apt-get update
+} >&2
 echo kubectl

packages/xcaddy/apt

@@ -0,0 +1,10 @@
+#!/bin/sh -e
+{
+sudo apt-get install -y debian-keyring debian-archive-keyring apt-transport-https
+curl --tlsv1.2 -sSLf 'https://dl.cloudsmith.io/public/caddy/xcaddy/gpg.key' |
+	sudo gpg --dearmor --yes -o /usr/share/keyrings/caddy-xcaddy-archive-keyring.gpg
+curl --tlsv1.2 -sSLf 'https://dl.cloudsmith.io/public/caddy/xcaddy/debian.deb.txt' |
+	sudo tee /etc/apt/sources.list.d/caddy-xcaddy.list
+sudo apt-get update
+} >&2
+echo xcaddy