diff options
| -rwxr-xr-x | archsetup | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -893,9 +893,13 @@ user_customizations() { dconf write /org/gnome/desktop/interface/cursor-size 24 " >> "$logfile" 2>&1 ) || error_warn "$action" "$?" - action="restoring dotfile versions" && display "task" "$action" - (cd "$dotfiles_dir" && git config --global --add safe.directory "$user_archsetup_dir" && \ - git restore . >> "$logfile" 2>&1 ) || error_warn "$action" "$?" + action="marking dotfile dir as safe.directory" && display "task" "$action" + if git config --global --add safe.directory "$user_archsetup_dir" >> "$logfile" 2>&1; then + action="restoring dotfile versions" && display "task" "$action" + git -C "$dotfiles_dir" restore . >> "$logfile" 2>&1 || error_warn "$action" "$?" + else + error_warn "marking dotfile dir as safe.directory" "$?" + fi action="creating common directories" && display "task" "$action" # Create default directories and grant permissions |