Skip to content

fix: refactor package parsing and fix command execution #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: refactor package parsing and fix command execution #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions bin/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,35 +34,36 @@ install_default_go_pkgs() {
if [ ! -f "$default_go_pkgs" ]; then return; fi

while read -r line; do
name=$(echo "$line" |
sed 's|\(.*\) //.*$|\1|' |
sed -E 's|^[[:space:]]*//.*||') # the first sed is for comments after package names, the second for full line comments

# Skip empty lines
if [ -z "$name" ]; then continue; fi
# Skip empty lines and comments
[[ -z "$line" || "$line" =~ ^[[:space:]]*// ]] && continue

# Remove inline comments and trim whitespace
name=$(echo "$line" | sed 's|//.*||' | xargs)

# Skip if empty after processing
[ -z "$name" ] && continue

echo -ne "\nInstalling \033[33m${name}\033[39m go pkg... " >&2

# if using go > 1.16 then use go install as the preferred donwload path
# if using go > 1.16 then use go install as the preferred download path
if [ "$go_major_version" -ge 2 ] || [ "${go_minor_version//[!0-9]*/}" -ge 16 ]; then
go_cmd=(install)
if [[ $name != *"@"* ]]; then
name="${name}@latest"
pkg_to_install="${name}@latest"
else
pkg_to_install="${name}"
fi

GOROOT="$ASDF_INSTALL_PATH/go" \
GOPATH="$ASDF_INSTALL_PATH/packages" \
GOBIN="$ASDF_INSTALL_PATH/bin" \
PATH="$go_path:$PATH" \
go install "$name" >/dev/null && rc=$? || rc=$?
else
GOROOT="$ASDF_INSTALL_PATH/go" \
GOPATH="$ASDF_INSTALL_PATH/packages" \
PATH="$go_path:$PATH" \
GOBIN="$ASDF_INSTALL_PATH/bin" \
go get -u "$name" >/dev/null && rc=$? || rc=$?
go_cmd=(get -u)
pkg_to_install="${name}"
fi

if [[ $rc -eq 0 ]]; then
# Execute the go command with common environment
if GOROOT="$ASDF_INSTALL_PATH/go" \
GOPATH="$ASDF_INSTALL_PATH/packages" \
GOBIN="$ASDF_INSTALL_PATH/bin" \
PATH="$go_path:$PATH" \
go "${go_cmd[@]}" "$pkg_to_install" >/dev/null 2>&1; then
msg "SUCCESS"
else
err "FAIL"
Expand All @@ -71,4 +72,4 @@ install_default_go_pkgs() {
}

install_golang "$ASDF_INSTALL_VERSION" "${ASDF_DOWNLOAD_PATH:-}" "$ASDF_INSTALL_PATH"
install_default_go_pkgs "$ASDF_INSTALL_PATH" "$ASDF_INSTALL_VERSION"
install_default_go_pkgs "$ASDF_INSTALL_PATH" "$ASDF_INSTALL_VERSION"
Loading