From 0e44b2c51ddee848c632a794d5ca1219b0a83f57 Mon Sep 17 00:00:00 2001 From: Emil Diaz Date: Wed, 14 Oct 2020 21:52:12 -0400 Subject: [PATCH] Rearranging files into standard unix dirs --- vulcan => bin/vulcan | 4 ++-- {lib => libexec}/args.sh | 0 {lib => libexec}/common.sh | 0 {lib => libexec}/install.sh | 0 {lib => libexec}/installers/asdf.sh | 0 {lib => libexec}/installers/brew.sh | 0 {lib => libexec}/installers/darwin.sh | 4 ++-- {lib => libexec}/installers/helm-plugin.sh | 0 {lib => libexec}/installers/npm.sh | 0 {lib => libexec}/installers/nvm.sh | 0 {lib => libexec}/installers/pip.sh | 0 {lib => libexec}/installers/pipx.sh | 0 {lib => libexec}/installers/pyenv.sh | 0 {lib => libexec}/installers/sdk-configure.sh | 0 {lib => libexec}/installers/sdk.sh | 0 {lib => libexec}/installers/tfenv.sh | 0 {lib => libexec}/logs.sh | 0 {packages => libexec/packages}/asdf/direnv-configure.sh | 0 {packages => libexec/packages}/asdf/helmsman-install.sh | 2 +- {packages => libexec/packages}/asdf/java-configure.sh | 0 {packages => libexec/packages}/asdf/nodejs-install.sh | 2 +- {packages => libexec/packages}/asdf/poetry-configure.sh | 0 {packages => libexec/packages}/asdf/python-install.sh | 2 +- {packages => libexec/packages}/brew/asdf-configure.sh | 0 {packages => libexec/packages}/brew/direnv-configure.sh | 0 {packages => libexec/packages}/brew/gcloud-configure.sh | 0 {packages => libexec/packages}/brew/gnu-tar-configure.sh | 0 {packages => libexec/packages}/brew/golang-configure.sh | 0 {packages => libexec/packages}/brew/helm-configure.sh | 0 {packages => libexec/packages}/brew/java-configure.sh | 0 {packages => libexec/packages}/brew/kubectl-configure.sh | 0 {packages => libexec/packages}/brew/nvm-configure.sh | 0 {packages => libexec/packages}/brew/packer-configure.sh | 0 {packages => libexec/packages}/brew/php-configure.sh | 0 {packages => libexec/packages}/brew/poetry-configure.sh | 0 {packages => libexec/packages}/brew/pyenv-configure.sh | 0 {packages => libexec/packages}/brew/terraform-configure.sh | 0 37 files changed, 7 insertions(+), 7 deletions(-) rename vulcan => bin/vulcan (90%) rename {lib => libexec}/args.sh (100%) rename {lib => libexec}/common.sh (100%) rename {lib => libexec}/install.sh (100%) rename {lib => libexec}/installers/asdf.sh (100%) rename {lib => libexec}/installers/brew.sh (100%) rename {lib => libexec}/installers/darwin.sh (92%) rename {lib => libexec}/installers/helm-plugin.sh (100%) rename {lib => libexec}/installers/npm.sh (100%) rename {lib => libexec}/installers/nvm.sh (100%) rename {lib => libexec}/installers/pip.sh (100%) rename {lib => libexec}/installers/pipx.sh (100%) rename {lib => libexec}/installers/pyenv.sh (100%) rename {lib => libexec}/installers/sdk-configure.sh (100%) rename {lib => libexec}/installers/sdk.sh (100%) rename {lib => libexec}/installers/tfenv.sh (100%) rename {lib => libexec}/logs.sh (100%) rename {packages => libexec/packages}/asdf/direnv-configure.sh (100%) rename {packages => libexec/packages}/asdf/helmsman-install.sh (80%) rename {packages => libexec/packages}/asdf/java-configure.sh (100%) rename {packages => libexec/packages}/asdf/nodejs-install.sh (85%) rename {packages => libexec/packages}/asdf/poetry-configure.sh (100%) rename {packages => libexec/packages}/asdf/python-install.sh (79%) rename {packages => libexec/packages}/brew/asdf-configure.sh (100%) rename {packages => libexec/packages}/brew/direnv-configure.sh (100%) rename {packages => libexec/packages}/brew/gcloud-configure.sh (100%) rename {packages => libexec/packages}/brew/gnu-tar-configure.sh (100%) rename {packages => libexec/packages}/brew/golang-configure.sh (100%) rename {packages => libexec/packages}/brew/helm-configure.sh (100%) rename {packages => libexec/packages}/brew/java-configure.sh (100%) rename {packages => libexec/packages}/brew/kubectl-configure.sh (100%) rename {packages => libexec/packages}/brew/nvm-configure.sh (100%) rename {packages => libexec/packages}/brew/packer-configure.sh (100%) rename {packages => libexec/packages}/brew/php-configure.sh (100%) rename {packages => libexec/packages}/brew/poetry-configure.sh (100%) rename {packages => libexec/packages}/brew/pyenv-configure.sh (100%) rename {packages => libexec/packages}/brew/terraform-configure.sh (100%) diff --git a/vulcan b/bin/vulcan similarity index 90% rename from vulcan rename to bin/vulcan index 4d1f5bb..866db59 100755 --- a/vulcan +++ b/bin/vulcan @@ -18,8 +18,8 @@ Global Options: " # Imports -DIR="$( cd "$( dirname "${(%):-%x}" )" >/dev/null 2>&1 && pwd )" -source ${DIR}/lib/install.sh +DIR="$(dirname "$(greadlink -f "$0")")" +source ${DIR}/../libexec/install.sh # Arguments ACTION=$(parse_arg 'ACTION' 1 'install' "$@") diff --git a/lib/args.sh b/libexec/args.sh similarity index 100% rename from lib/args.sh rename to libexec/args.sh diff --git a/lib/common.sh b/libexec/common.sh similarity index 100% rename from lib/common.sh rename to libexec/common.sh diff --git a/lib/install.sh b/libexec/install.sh similarity index 100% rename from lib/install.sh rename to libexec/install.sh diff --git a/lib/installers/asdf.sh b/libexec/installers/asdf.sh similarity index 100% rename from lib/installers/asdf.sh rename to libexec/installers/asdf.sh diff --git a/lib/installers/brew.sh b/libexec/installers/brew.sh similarity index 100% rename from lib/installers/brew.sh rename to libexec/installers/brew.sh diff --git a/lib/installers/darwin.sh b/libexec/installers/darwin.sh similarity index 92% rename from lib/installers/darwin.sh rename to libexec/installers/darwin.sh index 04f6843..a8cf18a 100644 --- a/lib/installers/darwin.sh +++ b/libexec/installers/darwin.sh @@ -70,8 +70,8 @@ darwin_install_or_upgrade_package() { return fi - local INSTALL_SCRIPT="${INSTALLERS_DIR}/../../packages/${INSTALLER}/$(echo ${PROGRAM} | sed -e 's/\//_/')-install.sh" - local CONFIGURE_SCRIPT="${INSTALLERS_DIR}/../../packages/${INSTALLER}/$(echo ${PROGRAM} | sed -e 's/\//_/')-configure.sh" + local INSTALL_SCRIPT="${INSTALLERS_DIR}/../packages/${INSTALLER}/$(echo ${PROGRAM} | sed -e 's/\//_/')-install.sh" + local CONFIGURE_SCRIPT="${INSTALLERS_DIR}/../packages/${INSTALLER}/$(echo ${PROGRAM} | sed -e 's/\//_/')-configure.sh" # install via custom script if [ -f "${INSTALL_SCRIPT}" ]; then diff --git a/lib/installers/helm-plugin.sh b/libexec/installers/helm-plugin.sh similarity index 100% rename from lib/installers/helm-plugin.sh rename to libexec/installers/helm-plugin.sh diff --git a/lib/installers/npm.sh b/libexec/installers/npm.sh similarity index 100% rename from lib/installers/npm.sh rename to libexec/installers/npm.sh diff --git a/lib/installers/nvm.sh b/libexec/installers/nvm.sh similarity index 100% rename from lib/installers/nvm.sh rename to libexec/installers/nvm.sh diff --git a/lib/installers/pip.sh b/libexec/installers/pip.sh similarity index 100% rename from lib/installers/pip.sh rename to libexec/installers/pip.sh diff --git a/lib/installers/pipx.sh b/libexec/installers/pipx.sh similarity index 100% rename from lib/installers/pipx.sh rename to libexec/installers/pipx.sh diff --git a/lib/installers/pyenv.sh b/libexec/installers/pyenv.sh similarity index 100% rename from lib/installers/pyenv.sh rename to libexec/installers/pyenv.sh diff --git a/lib/installers/sdk-configure.sh b/libexec/installers/sdk-configure.sh similarity index 100% rename from lib/installers/sdk-configure.sh rename to libexec/installers/sdk-configure.sh diff --git a/lib/installers/sdk.sh b/libexec/installers/sdk.sh similarity index 100% rename from lib/installers/sdk.sh rename to libexec/installers/sdk.sh diff --git a/lib/installers/tfenv.sh b/libexec/installers/tfenv.sh similarity index 100% rename from lib/installers/tfenv.sh rename to libexec/installers/tfenv.sh diff --git a/lib/logs.sh b/libexec/logs.sh similarity index 100% rename from lib/logs.sh rename to libexec/logs.sh diff --git a/packages/asdf/direnv-configure.sh b/libexec/packages/asdf/direnv-configure.sh similarity index 100% rename from packages/asdf/direnv-configure.sh rename to libexec/packages/asdf/direnv-configure.sh diff --git a/packages/asdf/helmsman-install.sh b/libexec/packages/asdf/helmsman-install.sh similarity index 80% rename from packages/asdf/helmsman-install.sh rename to libexec/packages/asdf/helmsman-install.sh index 704f5f2..9265267 100755 --- a/packages/asdf/helmsman-install.sh +++ b/libexec/packages/asdf/helmsman-install.sh @@ -2,6 +2,6 @@ VERSION=$1 PROGRAMS_DIR="$( cd "$( dirname "${(%):-%x}" )" >/dev/null 2>&1 && pwd )" -source ${PROGRAMS_DIR}/../../lib/installers/asdf.sh +source ${PROGRAMS_DIR}/../../installers/asdf.sh asdf_install_or_upgrade_package helmsman "${VERSION}" --plugin https://github.com/jkrukoff-cb/asdf-helmsman.git diff --git a/packages/asdf/java-configure.sh b/libexec/packages/asdf/java-configure.sh similarity index 100% rename from packages/asdf/java-configure.sh rename to libexec/packages/asdf/java-configure.sh diff --git a/packages/asdf/nodejs-install.sh b/libexec/packages/asdf/nodejs-install.sh similarity index 85% rename from packages/asdf/nodejs-install.sh rename to libexec/packages/asdf/nodejs-install.sh index 6217364..6dbd471 100755 --- a/packages/asdf/nodejs-install.sh +++ b/libexec/packages/asdf/nodejs-install.sh @@ -2,7 +2,7 @@ VERSION=$1 PROGRAMS_DIR="$( cd "$( dirname "${(%):-%x}" )" >/dev/null 2>&1 && pwd )" -source ${PROGRAMS_DIR}/../../lib/installers/asdf.sh +source ${PROGRAMS_DIR}/../../installers/asdf.sh bash -c '${ASDF_DATA_DIR:=$HOME/.asdf}/plugins/nodejs/bin/import-release-team-keyring' > /dev/null 2>&1 asdf_install_or_upgrade_package nodejs "${VERSION}" diff --git a/packages/asdf/poetry-configure.sh b/libexec/packages/asdf/poetry-configure.sh similarity index 100% rename from packages/asdf/poetry-configure.sh rename to libexec/packages/asdf/poetry-configure.sh diff --git a/packages/asdf/python-install.sh b/libexec/packages/asdf/python-install.sh similarity index 79% rename from packages/asdf/python-install.sh rename to libexec/packages/asdf/python-install.sh index ff8e279..8889f22 100755 --- a/packages/asdf/python-install.sh +++ b/libexec/packages/asdf/python-install.sh @@ -2,7 +2,7 @@ VERSION=$1 PROGRAMS_DIR="$( cd "$( dirname "${(%):-%x}" )" >/dev/null 2>&1 && pwd )" -source ${PROGRAMS_DIR}/../../lib/installers/asdf.sh +source ${PROGRAMS_DIR}/../../installers/asdf.sh asdf_install_or_upgrade_package python "${VERSION}" pip3 install --upgrade pip > /dev/null 2>&1 diff --git a/packages/brew/asdf-configure.sh b/libexec/packages/brew/asdf-configure.sh similarity index 100% rename from packages/brew/asdf-configure.sh rename to libexec/packages/brew/asdf-configure.sh diff --git a/packages/brew/direnv-configure.sh b/libexec/packages/brew/direnv-configure.sh similarity index 100% rename from packages/brew/direnv-configure.sh rename to libexec/packages/brew/direnv-configure.sh diff --git a/packages/brew/gcloud-configure.sh b/libexec/packages/brew/gcloud-configure.sh similarity index 100% rename from packages/brew/gcloud-configure.sh rename to libexec/packages/brew/gcloud-configure.sh diff --git a/packages/brew/gnu-tar-configure.sh b/libexec/packages/brew/gnu-tar-configure.sh similarity index 100% rename from packages/brew/gnu-tar-configure.sh rename to libexec/packages/brew/gnu-tar-configure.sh diff --git a/packages/brew/golang-configure.sh b/libexec/packages/brew/golang-configure.sh similarity index 100% rename from packages/brew/golang-configure.sh rename to libexec/packages/brew/golang-configure.sh diff --git a/packages/brew/helm-configure.sh b/libexec/packages/brew/helm-configure.sh similarity index 100% rename from packages/brew/helm-configure.sh rename to libexec/packages/brew/helm-configure.sh diff --git a/packages/brew/java-configure.sh b/libexec/packages/brew/java-configure.sh similarity index 100% rename from packages/brew/java-configure.sh rename to libexec/packages/brew/java-configure.sh diff --git a/packages/brew/kubectl-configure.sh b/libexec/packages/brew/kubectl-configure.sh similarity index 100% rename from packages/brew/kubectl-configure.sh rename to libexec/packages/brew/kubectl-configure.sh diff --git a/packages/brew/nvm-configure.sh b/libexec/packages/brew/nvm-configure.sh similarity index 100% rename from packages/brew/nvm-configure.sh rename to libexec/packages/brew/nvm-configure.sh diff --git a/packages/brew/packer-configure.sh b/libexec/packages/brew/packer-configure.sh similarity index 100% rename from packages/brew/packer-configure.sh rename to libexec/packages/brew/packer-configure.sh diff --git a/packages/brew/php-configure.sh b/libexec/packages/brew/php-configure.sh similarity index 100% rename from packages/brew/php-configure.sh rename to libexec/packages/brew/php-configure.sh diff --git a/packages/brew/poetry-configure.sh b/libexec/packages/brew/poetry-configure.sh similarity index 100% rename from packages/brew/poetry-configure.sh rename to libexec/packages/brew/poetry-configure.sh diff --git a/packages/brew/pyenv-configure.sh b/libexec/packages/brew/pyenv-configure.sh similarity index 100% rename from packages/brew/pyenv-configure.sh rename to libexec/packages/brew/pyenv-configure.sh diff --git a/packages/brew/terraform-configure.sh b/libexec/packages/brew/terraform-configure.sh similarity index 100% rename from packages/brew/terraform-configure.sh rename to libexec/packages/brew/terraform-configure.sh