Bump Debian version and polish script

Author: mcrmonkey

.gitignore

@@ -0,0 +1 @@
+output

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:bullseye
 LABEL maintainer "ant <git@manchestermonkey.co.uk>"
 
 RUN apt-get update -qq && \

Makefile

@@ -1,24 +1,25 @@
 SHELL = /bin/bash
 
-.PHONY: help build go
+.PHONY: help container package
 
 .DEFAULT_GOAL = help
 
 TOOL := "terraform"
 
 help:
-	@echo "You'll need to specify a thing to do:"
-	@egrep '^(.+)\:\ ##\ (.+)' ${MAKEFILE_LIST} | column -t -c 2 -s ':#'
+	@echo -e "\nYou'll need to specify a thing to do:\n"
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-\/]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+	@echo -e "\nSpecify "TOOL=" and/or "VERSION=" to override defaults\n"
 
-build: ## - Build Docker image
+container: ## - Build Docker image to fetch and create packages
 	@echo "[i] Building docker image"
 	@docker build -t mcrmonkey/hashi-pkg .
 
 output:
 	@echo "[i] Creating output directory"
 	@mkdir output
 
-go: ## - Go get the tool. Specify "TOOL=" and/or "VERSION=" to override defaults
+package: ## - Download the tool and create a package
 	@echo "[i] Getting ${TOOL}"
 	@${MAKE} output
 	@docker run -it --rm -e TOOL="${TOOL}" -e VERSION="${VERSION}" -v ${PWD}/output:/output mcrmonkey/hashi-pkg

README.md

@@ -27,25 +27,25 @@ To avoid adding extra junk to your system this makes use of a docker container w
 To build the image run the following on your system:
 
 ```shell
-make build
+make container
 ```
 
 To get the latest terraform and turn it in to a package run the following:
 
 ```shell
-make go
+make package
 ```
 
 To get an older version of terraform specify the version, like so:
 
 ```shell
-make VERSION="0.7.4" go
+make VERSION="0.7.4" package
 ```
 
 To specify an alternate tool specify the tool name, like so:
 
 ```shell
-make TOOL="packer" go
+make TOOL="packer" package
 ```
 
 The `TOOL` and `VERSION` can be specified together to get specific versions of tools.
@@ -58,7 +58,7 @@ If these variables are not specified it will default to getting and packaging th
 There are some things to be aware of:
 
 * Due to the format of the changelog being different to what the RPM builder
-  tool expects so is not included in the RPM package.
+  tool expects the change log is not included in the RPM package.
 * The Docker image is probably a little larger than it should be due to the
-  repo building tools that aren't currently used
+  repo building tools that are included but aren't currently used
 

prep-pkg.sh

@@ -4,26 +4,49 @@ set -e
 trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
 trap 'if [ $? -ne 0 ]; then echo "\"${last_command}\" command filed with exit code $?."; fi' EXIT
 
+BLUE="\033[01;34m"
+YELLOW="\033[01;33m"
+GREEN="\033[01;32m"
+RED="\033[01;31m"
+NORM="\033[00m"
+
+
+error() {
+	echo -en "\n${RED}[!]${NORM} ${1}\n"
+	exit 1
+}
+
+warn() {
+	echo -en "\n${YELLOW}[w]${NORM} ${1}"
+}
+
+info() {
+	echo -en "\n${BLUE}[i]${NORM} ${1}"
+}
+
 
 if [ ! -z $TOOL ]; then
 	TOOL=$TOOL
 else
-	echo -e "[w] Tool name not set Use Envvar 'TOOL' Defaulting to: terraform"
+	warn "Variable '\$TOOL' not set, Defaulting to: terraform\n"
 	TOOL="terraform"
 fi
 
 
 if [ ! -z $VERSION ]; then
 	VERSION=$VERSION
 else
-	echo -e "[w] No version set, use Envvar 'VERSION' Defaulting to latest version for ${TOOL}"
+	warn "Variable '\$VERSION' not set, Defaulting to latest version for ${TOOL}\n"
 	VERSION=$(curl --fail --silent --location "https://api.github.com/repos/hashicorp/${TOOL}/tags"|grep '"name":'|sed -E 's/.*"([^"]+)".*/\1/'|head -n 1|tr -d 'v')
 fi
 
 
 PLATF=${1:-linux}
 ARCH=${2:-amd64}
 
+info "Preparing package for ${GREEN}${TOOL} ${VERSION}${NORM} for ${GREEN}${PLATF}${NORM} on ${GREEN}${ARCH}${NORM}...\n"
+
+
 URL="https://releases.hashicorp.com/${TOOL}/${VERSION}/${TOOL}_${VERSION}_${PLATF}_${ARCH}.zip"
 SHASUM="https://releases.hashicorp.com/${TOOL}/${VERSION}/${TOOL}_${VERSION}_SHA256SUMS"
 SHASUMSIG="${SHASUM}.sig"
@@ -35,35 +58,35 @@ OUTPATH="/output/${TOOL}"
 
 mkdir -p ${EXPATH} ${OUTPATH}/{deb,rpm}
 
-echo -ne "Importing Hashicorp GPG key from keybase: "
-curl -s ${HASHIGPG} |gpg --import - > /dev/null 2>&1 && echo "[OK]" || echo " ERROR"
+info "Importing Hashicorp GPG key from keybase: "
+curl -s ${HASHIGPG} |gpg --import - > /dev/null 2>&1 && echo -n "[OK]" || error " ERROR"
 
-echo -ne "Getting ${TOOL} ${VERSION}: "
-wget $URL > /dev/null 2>&1 && echo "[OK]" || echo " ERROR"
+info "Getting ${TOOL} ${VERSION}: "
+wget $URL > /dev/null 2>&1 && echo -n "[OK]" || error " ERROR"
 
-echo -ne "Getting changelog for ${VERSION}: "
-wget -O "/tf/${VERSION}/changelog.md" ${CHANGELOGURL} > /dev/null 2>&1 && echo "[OK]" || echo " ERROR"
+info "Getting changelog for ${VERSION}: "
+wget -O "/tf/${VERSION}/changelog.md" ${CHANGELOGURL} > /dev/null 2>&1 && echo -n "[OK]" || error " ERROR"
 
-echo -ne "Getting SHASUM file for ${TOOL}: "
-wget ${SHASUM} > /dev/null 2>&1 && echo "[OK]" || echo " ERROR"
+info "Getting SHASUM file for ${TOOL}: "
+wget ${SHASUM} > /dev/null 2>&1 && echo -n "[OK]" || error " ERROR"
 
-echo -ne "Getting SHASUM sig file for ${TOOL}: "
-wget ${SHASUMSIG} > /dev/null 2>&1 && echo "[OK]" || echo " ERROR"
+info "Getting SHASUM sig file for ${TOOL}: "
+wget ${SHASUMSIG} > /dev/null 2>&1 && echo -n "[OK]" || error " ERROR"
 
-echo -ne "Verify GPG signature for SHA256SUM file: "
-gpg --verify ${TOOL}_${VERSION}_SHA256SUMS.sig ${TOOL}_${VERSION}_SHA256SUMS > /dev/null 2>&1 && echo "[OK]"
+info "Verify GPG signature for SHA256SUM file: "
+gpg --verify ${TOOL}_${VERSION}_SHA256SUMS.sig ${TOOL}_${VERSION}_SHA256SUMS > /dev/null 2>&1 && echo -n "[OK]"
 
-echo -ne "Verifying SHA256SUM for ${TOOL}: "
+info "Verifying SHA256SUM for ${TOOL}: "
 sha256sum --ignore-missing -c ${TOOL}_${VERSION}_SHA256SUMS
 
-echo -ne "Unzipping ${TOOL} ${VERSION}: "
-unzip -o -qq ${TOOL}_${VERSION}_${PLATF}_${ARCH}.zip -d ${EXPATH} && rm -Rf ${VERSION}.zip > /dev/null 2>&1 && echo "[OK]" || echo " ERROR"
+info "Unzipping ${TOOL} ${VERSION}: "
+unzip -o -qq ${TOOL}_${VERSION}_${PLATF}_${ARCH}.zip -d ${EXPATH} && rm -Rf ${VERSION}.zip > /dev/null 2>&1 && echo -n "[OK]" || error " ERROR"
 
-echo -ne "Creating deb Package: "
-fpm -s dir -t deb -n ${TOOL} -v ${VERSION} -a ${ARCH} --deb-changelog /tf/${VERSION}/changelog.md -p ${OUTPATH}/deb ${EXPATH}/=/usr/bin > /dev/null 2>&1 && echo "[OK]" || echo " ERROR"
+info "Creating deb Package: "
+fpm -s dir -t deb -n ${TOOL} -v ${VERSION} -a ${ARCH} --deb-changelog /tf/${VERSION}/changelog.md -p ${OUTPATH}/deb ${EXPATH}/=/usr/bin > /dev/null 2>&1 && echo "[OK]" || error " ERROR"
 
 # Changelog omitted from RPM because not correct format
-echo -ne "Creating RPM Package: "
-fpm -s dir -t rpm -n ${TOOL} -v ${VERSION} -a ${ARCH} -p ${OUTPATH}/rpm ${EXPATH}/=/usr/bin > /dev/null 2>&1 && echo "[OK]" || echo " ERROR"
+info "Creating RPM Package: "
+fpm -s dir -t rpm -n ${TOOL} -v ${VERSION} -a ${ARCH} -p ${OUTPATH}/rpm ${EXPATH}/=/usr/bin > /dev/null 2>&1 && echo -en "[OK]\n" || error " ERROR"