rm utils.bash

Author: jiacai2050

bin/download

@@ -5,18 +5,9 @@ set -euo pipefail
 current_script_path=${BASH_SOURCE[0]}
 plugin_dir=$(dirname "$(dirname "$current_script_path")")
 
-# shellcheck source=./lib/utils.bash
-source "${plugin_dir}/lib/utils.bash"
-
 mkdir -p "$ASDF_DOWNLOAD_PATH"
 
-release_file="${ASDF_DOWNLOAD_PATH}/${TOOL_NAME}-${ASDF_INSTALL_VERSION}.tar.xz"
+release_file="${ASDF_DOWNLOAD_PATH}/zig-${ASDF_INSTALL_VERSION}.tar.xz"
 
-# Download tar.gz file to the download directory
 "${plugin_dir}/lib/utils.py" download "${ASDF_INSTALL_VERSION}" "${release_file}"
-
-#  Extract contents of tar.gz file into the download directory
-tar -xzf "$release_file" -C "$ASDF_DOWNLOAD_PATH" --strip-components=1 || fail "Could not extract $release_file"
-
-# Remove the tar file since we don't need to keep it
-rm "$release_file"
+tar -xzf "$release_file" -C "$ASDF_DOWNLOAD_PATH" --strip-components=1

bin/install

@@ -2,30 +2,28 @@
 
 set -euo pipefail
 
-current_script_path=${BASH_SOURCE[0]}
-plugin_dir=$(dirname "$(dirname "$current_script_path")")
-
-# shellcheck source=./lib/utils.bash
-source "${plugin_dir}/lib/utils.bash"
-
 install_version() {
 	local install_type="$1"
 	local version="$2"
-	local install_path="${3%/bin}/bin"
+	local install_path="$3"
 
 	if [ "$install_type" != "version" ]; then
-		fail "asdf-$TOOL_NAME supports release installs only"
+		fail "asdf-zig supports release installs only"
 	fi
 
 	(
 		mkdir -p "$install_path"
 		cp -r "$ASDF_DOWNLOAD_PATH"/* "$install_path"
+        mkdir -p "$install_path/bin"
+        mv "$install_path/zig" "$install_path/bin/zig"
 
-		local tool_cmd
-		tool_cmd="$(echo "$TOOL_TEST" | cut -d' ' -f1)"
-		test -x "$install_path/$tool_cmd" || fail "Expected $install_path/$tool_cmd to be executable."
+		local tool_cmd="zig"
+		if ! test -x "$install_path/bin/$tool_cmd"; then
+            echo "Expected $install_path/bin/zig to be executable."
+            exit 1
+        fi
 
-		echo "$TOOL_NAME $version installation was successful!"
+		echo "zig $version installation was successful!"
 	) || (
 		rm -rf "$install_path"
 		fail "An error occurred while installing $TOOL_NAME $version."

lib/utils.bash

@@ -2,7 +2,6 @@
 
 shellcheck --shell=bash --external-sources \
 	bin/* --source-path=template/lib/ \
-	lib/utils.bash \
 	scripts/*
 
 shfmt --language-dialect bash --diff \