Copy over some fixes.

marshall/installers/900_utils.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 # shellcheck disable=SC1091
-source /installers/config
+source /usr/local/lib/marshall_installer
-
+title "Utils"
-${APT_GET} \
+install \
 	inetutils-ping \
 	nano \
-	host \
 	curl \
 	wget \
-	unzip \
+	unzip
-	ca-certificates \
-	jq

marshall/installers/901_jq.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# shellcheck disable=SC1091
+source /usr/local/lib/marshall_installer
+add_ppa ppa:rmescandon/yq
+install yq jq

marshall/installers/901_package_report.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-chmod +x /usr/bin/package-report

marshall/installers/902_cpu_monitoring.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+# shellcheck disable=SC1091
+source /usr/local/lib/marshall_installer
+install htop btop cpulimit

marshall/installers/903_version_control.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# shellcheck disable=SC1091,SC2164
+source /usr/local/lib/marshall_installer
+title "Installing version control tools"
+
+# MB: This is all a bunch of hacky stuff because I really, really don't want to install perl.
+(
+	install equivs
+	mkdir /tmp/equivs
+	cd /tmp/equivs
+	{
+		echo "Section: misc"
+		echo "Priority: optional"
+		echo "Standards-Version: 3.9.2"
+		echo "Package: perl-local"
+		echo "Provides: perl, liberror-perl"
+	} >perl-local
+	equivs-build perl-local 2>/dev/null 1>&2
+	dpkg -i perl-*.deb 2>/dev/null 1>&2
+	remove equivs
+	rm -rf /tmp/equivs
+)
+
+install git

marshall/installers/904_redis.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# shellcheck disable=SC1091
+source /usr/local/lib/marshall_installer
+install redis-tools
+rm \
+	/usr/bin/redis-check-aof \
+	/usr/bin/redis-check-rdb \
+	/usr/bin/redis-benchmark

marshall/installers/905_xtail.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+# shellcheck disable=SC1091
+source /usr/local/lib/marshall_installer
+install "xtail"

marshall/usr/bin/package-report

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-printf "Packages installed:\n KiloBytes\tPackage\n"
-
-# shellcheck disable=SC2312
-dpkg-query -W --showformat='${Installed-Size;10}\t${Package}\n' | sort -k1,1n | tac | head -n 5