fix: relative path sourcing for asdf-direnv compat (#39)

jthegedus · Feb 28, 2021 · 9b3b917 · 9b3b917
1 parent ad3bbfa
commit 9b3b917
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 10 deletions.
diff --git a/bin/download b/bin/download
@@ -2,10 +2,13 @@
 
 set -euo pipefail
 
+current_script_path="${BASH_SOURCE[0]}"
+plugin_dir="$(dirname "$(dirname "$current_script_path")")"
+
 # shellcheck source=../lib/helpers.bash
-source "$(dirname "$0")/../lib/helpers.bash"
+source "${plugin_dir}/lib/helpers.bash"
 # shellcheck source=../lib/utils.bash
-source "$(dirname "$0")/../lib/utils.bash"
+source "${plugin_dir}/lib/utils.bash"
 
 download() {
 	local gcs_bucket_name="cloud-sdk-release"

diff --git a/bin/exec-env b/bin/exec-env
@@ -3,10 +3,10 @@
 set -euo pipefail
 
 current_script_path="${BASH_SOURCE[0]}"
-gcloud_plugin_dir="$(dirname "$(dirname "$current_script_path")")"
+plugin_dir="$(dirname "$(dirname "$current_script_path")")"
 
 # shellcheck source=../lib/utils.bash
-source "${gcloud_plugin_dir}/lib/utils.bash"
+source "${plugin_dir}/lib/utils.bash"
 
 if [[ ! -x "$(command -v python)" ]]; then
 	log_failure_and_exit "Python not found and is required for gcloud. Might I suggest https://github.com/danhper/asdf-python"

diff --git a/bin/install b/bin/install
@@ -2,10 +2,13 @@
 
 set -euo pipefail
 
+current_script_path="${BASH_SOURCE[0]}"
+plugin_dir="$(dirname "$(dirname "$current_script_path")")"
+
 # shellcheck source=../lib/helpers.bash
-source "$(dirname "$0")/../lib/helpers.bash"
+source "${plugin_dir}/lib/helpers.bash"
 # shellcheck source=../lib/utils.bash
-source "$(dirname "$0")/../lib/utils.bash"
+source "${plugin_dir}/lib/utils.bash"
 
 install_gcloud() {
 	tmp_download_dir=$(mktemp -d -t 'asdf_gcloud_XXXXXX')

diff --git a/bin/post-install b/bin/post-install
@@ -2,8 +2,11 @@
 
 set -euo pipefail
 
+current_script_path="${BASH_SOURCE[0]}"
+plugin_dir="$(dirname "$(dirname "$current_script_path")")"
+
 # shellcheck source=../lib/utils.bash
-source "$(dirname "$0")/../lib/utils.bash"
+source "${plugin_dir}/lib/utils.bash"
 
 function default_cloud_sdk_components_config_path() {
 	local default_components_filename=".default-cloud-sdk-components"

diff --git a/bin/post-plugin-add b/bin/post-plugin-add
@@ -2,7 +2,10 @@
 
 set -euo pipefail
 
+current_script_path="${BASH_SOURCE[0]}"
+plugin_dir="$(dirname "$(dirname "$current_script_path")")"
+
 # shellcheck source=../lib/utils.bash
-source "$(dirname "$0")/../lib/utils.bash"
+source "${plugin_dir}/lib/utils.bash"
 
 check_dependencies "$(dirname "$0")/../lib/dependencies.txt" "warning"
diff --git a/bin/pre-plugin-remove b/bin/pre-plugin-remove
@@ -2,8 +2,11 @@
 
 set -euo pipefail
 
+current_script_path="${BASH_SOURCE[0]}"
+plugin_dir="$(dirname "$(dirname "$current_script_path")")"
+
 # shellcheck source=../lib/utils.bash
-source "$(dirname "$0")/../lib/utils.bash"
+source "${plugin_dir}/lib/utils.bash"
 
 # Google Cloud SDK uninstall instructions - https://cloud.google.com/sdk/docs/uninstall-cloud-sdk
 

diff --git a/bin/uninstall b/bin/uninstall
@@ -2,8 +2,11 @@
 
 set -euo pipefail
 
+current_script_path="${BASH_SOURCE[0]}"
+plugin_dir="$(dirname "$(dirname "$current_script_path")")"
+
 # shellcheck source=../lib/utils.bash
-source "$(dirname "$0")/../lib/utils.bash"
+source "${plugin_dir}/lib/utils.bash"
 
 # Google Cloud SDK uninstall instructions - https://cloud.google.com/sdk/docs/uninstall-cloud-sdk