Customization/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-12 08:50:08 +00:00
Code Releases Activity

fix(cli): make omz honour symlinks when changing .zshrc (#11082)

Browse source
This commit is contained in:
Ben Walton 2022-08-02 18:28:44 +01:00 committed by GitHub
parent 0346cdf7f6
commit 97134d1eed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/cli.zsh
View file

@ -280,9 +280,10 @@ multi == 1 && length(\$0) > 0 {
" "
local zdot="${ZDOTDIR:-$HOME}" local zdot="${ZDOTDIR:-$HOME}"
awk "$awk_script" "$zdot/.zshrc" > "$zdot/.zshrc.new" \ local zshrc="${${:-"${zdot}/.zshrc"}:A}"
&& command mv -f "$zdot/.zshrc" "$zdot/.zshrc.bck" \ awk "$awk_script" "$zshrc" > "$zdot/.zshrc.new" \
&& command mv -f "$zdot/.zshrc.new" "$zdot/.zshrc" && command cp -f "$zshrc" "$zdot/.zshrc.bck" \
&& command mv -f "$zdot/.zshrc.new" "$zshrc"
# Exit if the new .zshrc file wasn't created correctly # Exit if the new .zshrc file wasn't created correctly
[[ $? -eq 0 ]] || { [[ $? -eq 0 ]] || {
@ -294,8 +295,7 @@ multi == 1 && length(\$0) > 0 {
# Exit if the new .zshrc file has syntax errors # Exit if the new .zshrc file has syntax errors
if ! command zsh -n "$zdot/.zshrc"; then if ! command zsh -n "$zdot/.zshrc"; then
_omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..." _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new" command mv -f "$zdot/.zshrc.bck" "$zshrc"
command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
return 1 return 1
fi fi
@ -354,9 +354,10 @@ multi == 1 && /^[^#]*\)/ {
" "
local zdot="${ZDOTDIR:-$HOME}" local zdot="${ZDOTDIR:-$HOME}"
awk "$awk_script" "$zdot/.zshrc" > "$zdot/.zshrc.new" \ local zshrc="${${:-"${zdot}/.zshrc"}:A}"
&& command mv -f "$zdot/.zshrc" "$zdot/.zshrc.bck" \ awk "$awk_script" "$zshrc" > "$zdot/.zshrc.new" \
&& command mv -f "$zdot/.zshrc.new" "$zdot/.zshrc" && command cp -f "$zshrc" "$zdot/.zshrc.bck" \
&& command mv -f "$zdot/.zshrc.new" "$zshrc"
# Exit if the new .zshrc file wasn't created correctly # Exit if the new .zshrc file wasn't created correctly
[[ $? -eq 0 ]] || { [[ $? -eq 0 ]] || {
@ -368,8 +369,7 @@ multi == 1 && /^[^#]*\)/ {
# Exit if the new .zshrc file has syntax errors # Exit if the new .zshrc file has syntax errors
if ! command zsh -n "$zdot/.zshrc"; then if ! command zsh -n "$zdot/.zshrc"; then
_omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..." _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new" command mv -f "$zdot/.zshrc.bck" "$zshrc"
command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
return 1 return 1
fi fi
@ -715,7 +715,8 @@ END {
' '
local zdot="${ZDOTDIR:-$HOME}" local zdot="${ZDOTDIR:-$HOME}"
awk "$awk_script" "$zdot/.zshrc" > "$zdot/.zshrc.new" \ local zshrc="${${:-"${zdot}/.zshrc"}:A}"
awk "$awk_script" "$zshrc" > "$zdot/.zshrc.new" \
|| { || {
# Prepend ZSH_THEME= line to .zshrc if it doesn't exist # Prepend ZSH_THEME= line to .zshrc if it doesn't exist
cat <<EOF cat <<EOF
@ -724,8 +725,8 @@ ZSH_THEME="$1" # set by \`omz\`
EOF EOF
cat "$zdot/.zshrc" cat "$zdot/.zshrc"
} > "$zdot/.zshrc.new" \ } > "$zdot/.zshrc.new" \
&& command mv -f "$zdot/.zshrc" "$zdot/.zshrc.bck" \ && command cp -f "$zshrc" "$zdot/.zshrc.bck" \
&& command mv -f "$zdot/.zshrc.new" "$zdot/.zshrc" && command mv -f "$zdot/.zshrc.new" "$zshrc"
# Exit if the new .zshrc file wasn't created correctly # Exit if the new .zshrc file wasn't created correctly
[[ $? -eq 0 ]] || { [[ $? -eq 0 ]] || {
@ -737,8 +738,7 @@ EOF
# Exit if the new .zshrc file has syntax errors # Exit if the new .zshrc file has syntax errors
if ! command zsh -n "$zdot/.zshrc"; then if ! command zsh -n "$zdot/.zshrc"; then
_omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..." _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new" command mv -f "$zdot/.zshrc.bck" "$zshrc"
command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
return 1 return 1
fi fi