Skip to content

Commit

Permalink
Merge branch 'master' into dev/fix-253
Browse files Browse the repository at this point in the history
  • Loading branch information
balupton committed Oct 25, 2024
2 parents d2b29cb + 624d1db commit 36e8c75
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion commands/edit
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ function edit_() (

# invoke
if test "$dry" = 'yes'; then
__print_lines "${cmd[@]}"
# print a single line, with values space separated, such that [setup-git] works properly with [code --new-window]
__print_lines "${cmd[*]}"
else
"${cmd[@]}"
fi
Expand Down
2 changes: 2 additions & 0 deletions init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ else
fi
elif test -z "$-" -a -z "$*" -a "${CI-}" = 'true'; then
DOROTHY_LOAD='yes' # dash on github ci, in which [$-] and [$*] are empty, and $0 = /home/runner....
elif test -n "${NVIM-}"; then
DOROTHY_LOAD='yes' # neovim: $0 = init.sh, and BASH_SOURCE[*] is undefined
else
# bash v3 and dash do not set l in $-
# zsh does, however zsh we have a definite option earlier
Expand Down

0 comments on commit 36e8c75

Please sign in to comment.