Better output for .vim/ handling.
David Blume commited on 2018-04-30 10:15:37
Showing 1 changed files, with 5 additions and 3 deletions.
- setup.sh 1ce1931..8f5f6a4
| ... | ... |
@@ -66,14 +66,16 @@ if ! diff -qr $HOME/.vim .vim > /dev/null ; then |
| 66 | 66 |
cp -r .vim $HOME |
| 67 | 67 |
if [ -d $backup_dir/.vim ]; then |
| 68 | 68 |
# Copy back proprietary file types (ex. ftdetect/my.vim), if any. |
| 69 |
- cp -r -n $backup_dir/.vim $HOME |
|
| 69 |
+ cp -r -n $backup_dir/.vim $HOME || true |
|
| 70 | 70 |
fi |
| 71 | 71 |
fi |
| 72 | 72 |
if [[ -d $backup_dir/.vim || $DRY_RUN -ne 0 ]]; then |
| 73 |
- echo |
|
| 74 |
- diff -qr "$backup_dir/.vim" "$HOME/.vim" || true |
|
| 73 |
+ if ! diff -qr "$backup_dir/.vim" "$HOME/.vim" ; then |
|
| 75 | 74 |
echo "# diff -qr \"$backup_dir/.vim\" \"$HOME/.vim\"" |
| 76 | 75 |
echo |
| 76 |
+ else |
|
| 77 |
+ echo No change to the .vim/ directories after restoring proprietary files. |
|
| 78 |
+ fi |
|
| 77 | 79 |
fi |
| 78 | 80 |
else |
| 79 | 81 |
echo No change to the .vim/ directories. |
| 80 | 82 |