From cbe7b47a9681b6ca1e542c47dc7026b39d27b3cb Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 14 Dec 2019 17:40:21 +0000 Subject: [PATCH] refactor(tools): __dispatch.sh now uses relative paths This enables usage of __dispatch.sh from anywhere, even outside of the depot. Specifically this means I can add `~/depot/bin` to my $PATH and all the registered tools work from anywhere. --- third_party/default.nix | 1 + tools/bin/__dispatch.sh | 6 +++--- tools/bin/{pass => kms_pass} | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename tools/bin/{pass => kms_pass} (100%) diff --git a/third_party/default.nix b/third_party/default.nix index 655f35b02..a02b05275 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -61,6 +61,7 @@ let rustc sbcl stdenv + stern symlinkJoin terraform_0_12 tree diff --git a/tools/bin/__dispatch.sh b/tools/bin/__dispatch.sh index fb8a4d779..d1d54909c 100755 --- a/tools/bin/__dispatch.sh +++ b/tools/bin/__dispatch.sh @@ -6,7 +6,7 @@ # to the key in nixpkgs which represents the program you want to run. set -ueo pipefail -readonly REPO_ROOT=$(git rev-parse --show-toplevel) +readonly REPO_ROOT=$(dirname $0)/../.. readonly TARGET_TOOL=$(basename $0) case "${TARGET_TOOL}" in @@ -20,9 +20,9 @@ case "${TARGET_TOOL}" in attr="tools.blog_cli" ;; stern) - attr="stern" + attr="third_party.stern" ;; - pass) + kms_pass) attr="tools.kms_pass" ;; aoc2019) diff --git a/tools/bin/pass b/tools/bin/kms_pass similarity index 100% rename from tools/bin/pass rename to tools/bin/kms_pass