From 80141ce683ca9182538be4c9c16ae15d88ccddbc Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Sun, 4 Jul 2021 15:35:54 +0000
Subject: [PATCH] Mess around with .env handling

---
 bin/dep       |  8 +++++++-
 bin/docker    |  8 +++++++-
 bin/packer    | 13 +++++++++++++
 bin/skopeo    |  8 +++++++-
 bin/terraform | 13 +++++++++++++
 5 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100755 bin/packer
 create mode 100755 bin/terraform

diff --git a/bin/dep b/bin/dep
index 689e1e5..b500f8d 100755
--- a/bin/dep
+++ b/bin/dep
@@ -2,4 +2,10 @@
 
 set -euo pipefail
 
-exec node "$(dirname "$(realpath "$0")")"/../tools/depgraph.js "$@"
+root="$(cd "$(dirname "$0")/.." && echo "${PWD}")"
+
+set -a
+. "${root}/.env"
+set +a
+
+exec node "${root}/tools/depgraph.js" "$@"
diff --git a/bin/docker b/bin/docker
index d1e1ebb..cc95d60 100755
--- a/bin/docker
+++ b/bin/docker
@@ -2,7 +2,13 @@
 
 set -euo pipefail
 
-export PATH="$(sed -E 's/:bin:/:/; s/(^|:)bin(:|$)//' <<< "${PATH}")"
+root="$(cd "$(dirname "$0")/.." && echo "${PWD}")"
+
+export PATH="$(sed -E "s_:${root}/bin:_:_; s_(^|:)${root}/bin(:|$)__" <<< "${PATH}")"
+
+set -a
+. "${root}/.env"
+set +a
 
 if [[ "${OSTYPE:-}" != darwin* ]] && [[ "${EUID}" != 0 ]]; then
     exec sudo -E docker "$@"
diff --git a/bin/packer b/bin/packer
new file mode 100755
index 0000000..046bb48
--- /dev/null
+++ b/bin/packer
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+root="$(cd "$(dirname "$0")/.." && echo "${PWD}")"
+
+export PATH="$(sed -E "s_:${root}/bin:_:_; s_(^|:)${root}/bin(:|$)__" <<< "${PATH}")"
+
+set -a
+. "${root}/.env"
+set +a
+
+exec packer "$@"
diff --git a/bin/skopeo b/bin/skopeo
index c9a585c..b88d16d 100755
--- a/bin/skopeo
+++ b/bin/skopeo
@@ -2,7 +2,13 @@
 
 set -euo pipefail
 
-export PATH="$(sed -E 's/:bin:/:/; s/(^|:)bin(:|$)//' <<< "${PATH}")"
+root="$(cd "$(dirname "$0")/.." && echo "${PWD}")"
+
+export PATH="$(sed -E "s_:${root}/bin:_:_; s_(^|:)${root}/bin(:|$)__" <<< "${PATH}")"
+
+set -a
+. "${root}/.env"
+set +a
 
 if [[ "${OSTYPE:-}" != darwin* ]] && [[ "${EUID}" != 0 ]]; then
     exec sudo -E skopeo "$@"
diff --git a/bin/terraform b/bin/terraform
new file mode 100755
index 0000000..58dbe2c
--- /dev/null
+++ b/bin/terraform
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+root="$(cd "$(dirname "$0")/.." && echo "${PWD}")"
+
+export PATH="$(sed -E "s_:${root}/bin:_:_; s_(^|:)${root}/bin(:|$)__" <<< "${PATH}")"
+
+set -a
+. "${root}/.env"
+set +a
+
+exec terraform "$@"