Skip to content
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

Allows _GO_SCRIPTS_DIR to be equal to _GO_ROOTDIR #250

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −1
Open

Allows _GO_SCRIPTS_DIR to be equal to _GO_ROOTDIR #250

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions go-core.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,15 @@ [email protected]_scripts_dir() {
"directory" >&2
return 1
fi

# If '_GO_SCRIPTS_DIR' was set to '_GO_ROOTDIR', 'scripts_dir' would end up
# with a trailing space. This would cause issues later in the code where path
# comparison would fail as paths would result in double slashes before
# command script paths.
if [[ "${scripts_dir: -1}" == '/' ]]; then
scripts_dir="${scripts_dir%/}"
fi

_GO_SCRIPTS_DIR="$scripts_dir"
}

Expand Down
7 changes: 6 additions & 1 deletion lib/internal/commands
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,13 @@ [email protected]_commands() {
for scripts_dir in "$@"; do
scripts=()

# Together with the existence of a potential script, we are also excluding
# the './go' itself. This is relevant for the case a user has set
# '_GO_SCRIPTS_DIR' to '_GO_ROOTDIR'. In that case, the './go' script would
# end up being considered a command script.
for script in "$scripts_dir"/*; do
if [[ -f "$script" && -x "$script" ]]; then
if [[ -f "$script" && -x "$script" &&
"$script" != "$_GO_ROOTDIR/$_GO_CMD" ]]; then
scripts+=("$script")
fi
done
Expand Down