Skip to content

Commit

Permalink
tools: Fix incorrectly quoted * in bash scripts (#39121)
Browse files Browse the repository at this point in the history
In a few places, we do something like `[[ "$var" == "*/filename" ]]`,
which checks for the variable being literally "*/filename" rather than
interpreting the `*` as a glob as intended.

This removes the unnecessary quotes so it works right.
  • Loading branch information
anomiex authored Aug 29, 2024
1 parent 48ac019 commit 7801b7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions tools/composer-update-monorepo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ function check_dir {
return 1
elif [[ -d "$1" ]]; then
DIR="${1%/}"
elif [[ "$1" == "*/composer.json" && -f "$1" ]]; then # DWIM
elif [[ "$1" == */composer.json && -f "$1" ]]; then # DWIM
DIR="$(dirname "$1")"
elif [[ "$1" == "*/composer.lock" && -f "$1" ]]; then # DWIM
elif [[ "$1" == */composer.lock && -f "$1" ]]; then # DWIM
DIR="$(dirname "$1")"
else
error "Directory $1 does not exist."
Expand Down
2 changes: 1 addition & 1 deletion tools/version-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function check_dir {
error "$DIR does not contain composer.json."
return 1
fi
elif [[ "$1" == "*/composer.json" && -f "$1" ]]; then # DWIM
elif [[ "$1" == */composer.json && -f "$1" ]]; then # DWIM
DIR="$(dirname "$1")"
else
error "Directory $1 does not exist."
Expand Down

0 comments on commit 7801b7f

Please sign in to comment.