From 03bfe08e1dd9faf48b06cb146bfa446575cde88a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 20 Dec 2019 20:18:41 +0000 Subject: chore: Significantly restructure folder layout This moves the various projects from "type-based" folders (such as "services" or "tools") into more appropriate semantic folders (such as "nix", "ops" or "web"). Deprecated projects (nixcon-demo & gotest) which only existed for testing/demonstration purposes have been removed. (Note: *all* builds are broken with this commit) --- tools/bin/__dispatch.sh | 44 -------------------------------------------- tools/bin/aoc2019 | 1 - tools/bin/blog_cli | 1 - tools/bin/kms_pass | 1 - tools/bin/kontemplate | 1 - tools/bin/rink | 1 - tools/bin/stern | 1 - tools/bin/terraform | 1 - 8 files changed, 51 deletions(-) delete mode 100755 tools/bin/__dispatch.sh delete mode 120000 tools/bin/aoc2019 delete mode 120000 tools/bin/blog_cli delete mode 120000 tools/bin/kms_pass delete mode 120000 tools/bin/kontemplate delete mode 120000 tools/bin/rink delete mode 120000 tools/bin/stern delete mode 120000 tools/bin/terraform (limited to 'tools/bin') diff --git a/tools/bin/__dispatch.sh b/tools/bin/__dispatch.sh deleted file mode 100755 index 473342769d57..000000000000 --- a/tools/bin/__dispatch.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash -# This script dispatches invocations transparently to programs instantiated from -# Nix. -# -# To add a new tool, insert it into the case statement below by setting `attr` -# to the key in nixpkgs which represents the program you want to run. -set -ueo pipefail - -readonly REPO_ROOT=$(dirname $0)/../.. -TARGET_TOOL=$(basename $0) - -case "${TARGET_TOOL}" in - terraform) - attr="third_party.terraform-gcp" - ;; - kontemplate) - attr="kontemplate" - ;; - blog_cli) - attr="tools.blog_cli" - ;; - stern) - attr="third_party.stern" - ;; - kms_pass) - attr="tools.kms_pass" - TARGET_TOOL="pass" - ;; - aoc2019) - attr="tools.aoc2019.${1}" - ;; - rink) - attr="third_party.rink" - ;; - *) - echo "The tool '${TARGET_TOOL}' is currently not installed in this repository." - exit 1 - ;; -esac - -result=$(nix-build --no-out-link --attr "${attr}" "${REPO_ROOT}") -PATH="${result}/bin:$PATH" - -exec "${TARGET_TOOL}" "${@}" diff --git a/tools/bin/aoc2019 b/tools/bin/aoc2019 deleted file mode 120000 index 8390ec9c9652..000000000000 --- a/tools/bin/aoc2019 +++ /dev/null @@ -1 +0,0 @@ -__dispatch.sh \ No newline at end of file diff --git a/tools/bin/blog_cli b/tools/bin/blog_cli deleted file mode 120000 index 8390ec9c9652..000000000000 --- a/tools/bin/blog_cli +++ /dev/null @@ -1 +0,0 @@ -__dispatch.sh \ No newline at end of file diff --git a/tools/bin/kms_pass b/tools/bin/kms_pass deleted file mode 120000 index 8390ec9c9652..000000000000 --- a/tools/bin/kms_pass +++ /dev/null @@ -1 +0,0 @@ -__dispatch.sh \ No newline at end of file diff --git a/tools/bin/kontemplate b/tools/bin/kontemplate deleted file mode 120000 index 8390ec9c9652..000000000000 --- a/tools/bin/kontemplate +++ /dev/null @@ -1 +0,0 @@ -__dispatch.sh \ No newline at end of file diff --git a/tools/bin/rink b/tools/bin/rink deleted file mode 120000 index 8390ec9c9652..000000000000 --- a/tools/bin/rink +++ /dev/null @@ -1 +0,0 @@ -__dispatch.sh \ No newline at end of file diff --git a/tools/bin/stern b/tools/bin/stern deleted file mode 120000 index 8390ec9c9652..000000000000 --- a/tools/bin/stern +++ /dev/null @@ -1 +0,0 @@ -__dispatch.sh \ No newline at end of file diff --git a/tools/bin/terraform b/tools/bin/terraform deleted file mode 120000 index 8390ec9c9652..000000000000 --- a/tools/bin/terraform +++ /dev/null @@ -1 +0,0 @@ -__dispatch.sh \ No newline at end of file -- cgit 1.4.1