Add some tooling for both platforms, fix installer bugs

.config/skhd/skhdrc

@@ -168,3 +168,9 @@ alt + shift - g : yabai -m space --gap abs:12; yabai -m space --padding abs:20:2
 #
 
 alt - s : yabai -m window --toggle shadow
+
+#
+# Custom picture in picture
+#
+
+alt - p : yabai -m window --toggle float; yabai -m window --toggle sticky; yabai -m window --toggle shadow

.dockerfile

@@ -31,6 +31,7 @@ RUN ./.install/node-source.sh
 #RUN ./.install/jdk.sh
 # more system
 RUN ./.install/docker.sh
+RUN ./.install/hadolint.sh
 # desktop
 #RUN ./.install/desktop.sh
 #RUN ./.install/firefox.sh

.drone.yml

@@ -118,6 +118,15 @@ steps:
   - ./.install/dust.sh
 ---
 kind: pipeline
+name: test-hadolint
+steps:
+- name: test-hadolint
+  image: alpine:latest
+  commands:
+  - ./.install/core.sh
+  - ./.install/hadolint.sh
+---
+kind: pipeline
 name: test-pure
 steps:
 - name: test-pure

.install/archival.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing archival tools..."

.install/caddy.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing Caddy $CADDY_VERSION..."
@@ -12,6 +12,7 @@ if [ "$CADDY_VERSION" = "master" ]; then
 else
 	branch=v$CADDY_VERSION
 fi
+
 git clone --depth 1 -b $branch https://github.com/caddyserver/caddy $(go env GOPATH)/src/github.com/caddyserver/caddy
 export GO111MODULE=on
 cd $(go env GOPATH)/src/github.com/caddyserver/caddy/caddy

.install/core.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing system utilities..."

.install/docker.sh

@@ -8,5 +8,6 @@ echo
 
 apk add --no-cache \
 	docker@community
+
 #upx /usr/bin/docker{,d,-proxy}
 

.install/dust.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+. "$(dirname "$0")"/../.versions
+
+echo
+echo "Installing dust $DUST_VERSION..."
+echo
+
+if [[ "$(uname -s)" == "Darwin" ]]; then
+	os="apple-darwin"
+else
+	os="unknown-linux-gnu"
+fi
+
+curl -fSLO https://github.com/bootandy/dust/releases/download/v$DUST_VERSION/dust-v$DUST_VERSION-x86_64-$os.tar.gz
+
+mkdir -p ~/.local/bin
+tar -xzf dust-v$DUST_VERSION-x86_64-$os.tar.gz -C ~/.local/bin
+upx ~/.local/bin/dust
+rm dust-v$DUST_VERSION-x86_64-$os.tar.gz

.install/emojify.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+. "$(dirname "$0")"/../.versions
+
+echo
+echo "Installing emojify..."
+echo
+
+mkdir -p ~/.local/bin
+curl -fLo ~/.local/bin/emojify \
+	https://raw.githubusercontent.com/mrowa44/emojify/master/emojify
+chmod a+x ~/.local/bin/emojify
+
+

.install/git.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing git..."

.install/gnupg.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing GnuPG..."

.install/golang-source.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing Go $GOLANG_VERSION..."

.install/gradlr.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing gradlr..."

.install/hadolint.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+. "$(dirname "$0")"/../.versions
+
+echo
+echo "Installing hadolint $HADOLINT_VERSION..."
+echo
+
+if [[ "$(uname -s)" == "Darwin" ]]; then
+	os="Darwin"
+else
+	os="Linux"
+fi
+
+mkdir -p ~/.local/bin
+curl -fLo ~/.local/bin/hadolint \
+	https://github.com/hadolint/hadolint/releases/download/v$HADOLINT_VERSION/hadolint-$os-x86_64
+chmod a+x ~/.local/bin/hadolint
+

.install/httpie.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing HTTPie..."

.install/iterm2profiles.sh

@@ -7,4 +7,10 @@ echo
 echo "Installing iTerm2 Profiles..."
 echo
 
+if ! [[ "$(uname -s)" == "Darwin" ]]; then
+	echo "Not supported on Linux"
+	exit 1
+fi
+
 ln -s $HOME/.config/iterm2profiles.json Library/Application\ Support/iTerm2/DynamicProfiles/env.json
+

.install/jdk.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing OpenJDK $JDK_NUMBER $JDK_VERSION..."
@@ -21,3 +21,4 @@ rm jdk.tar.gz
 ln -s /usr/local/jdk/bin/* /usr/local/bin/
 
 apk del --no-cache .build-deps
+

.install/jq.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing jq $JQ_VERSION..."
 echo
 
-mkdir -p  ~/.local/bin
+mkdir -p ~/.local/bin
 curl -fLo ~/.local/bin/jq \
 	https://github.com/stedolan/jq/releases/download/jq-$JQ_VERSION/jq-linux64
 chmod a+x ~/.local/bin/jq

.install/kubectl.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing kubectl $KUBECTL_VERSION..."
 echo
 
-mkdir -p  ~/.local/bin
+mkdir -p ~/.local/bin
 curl -fLo ~/.local/bin/kubectl \
 	https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl
 chmod a+x ~/.local/bin/kubectl

.install/minio-client.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing minio-client..."
 echo
 
-mkdir -p  ~/.local/bin
+mkdir -p ~/.local/bin
 curl -fLo ~/.local/bin/mc \
 	https://dl.minio.io/client/mc/release/linux-amd64/mc
 chmod a+x ~/.local/bin/mc

.install/neovim-source.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing neovim $NEOVIM_VERSION..."

.install/node-source.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing Node.js $NODE_VERSION..."

.install/packr.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing packr..."

.install/plug.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing vim-plug..."

.install/pure.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing pure-prompt for zsh..."

.install/python.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing Python 3 with apk..."

.install/sdk.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing C/C++ compilers..."

.install/sudo.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing sudo..."

.install/thefuck.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing thefuck for zsh..."

.install/upx.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing UPX..."

.install/yadm.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing yadm..."

.install/yarn.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing Yarn $YARN_VERSION..."

.install/zsh-autosuggestions.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing zsh-autosuggestions..."

.install/zsh-syntax-highlighting.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing zsh-syntax-highlighting..."

.install/zsh.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-source ./.versions
+. "$(dirname "$0")"/../.versions
 
 echo
 echo "Installing zsh..."

.versions

@@ -27,3 +27,6 @@ export JQ_VERSION=1.6
 
 export KUBECTL_VERSION=1.16.0
 
+export DUST_VERSION=0.3.1
+
+export HADOLINT_VERSION=1.17.2