Minor tweaks to config files, and bugfix for cp files in subdirectories in setup.sh
David Blume commited on 2016-02-29 11:31:33
Showing 3 changed files, with 5 additions and 4 deletions.
- .gitconfig 8af81da..1f7a3db
- .vimrc 66af252..4c4fd42
- setup.sh b314873..36034c5
| ... | ... |
@@ -163,7 +163,7 @@ if has("autocmd")
|
| 163 | 163 |
autocmd BufWrite *.py :call DeleteTrailingWS() " Delete trailing whitespace |
| 164 | 164 |
" Don't let smartindent unindent the # character in Python files |
| 165 | 165 |
autocmd FileType python inoremap # X<c-h># |
| 166 |
- autocmd FileType python set expandtab " Use spaces instead of tabs |
|
| 166 |
+ autocmd FileType c,cpp,python,brs set expandtab " Use spaces instead of tabs |
|
| 167 | 167 |
autocmd Filetype make setl noexpandtab " ...not for files that use tabs. |
| 168 | 168 |
|
| 169 | 169 |
" Use the vim command %retab before applying the following |
| ... | ... |
@@ -39,17 +39,17 @@ do |
| 39 | 39 |
echo "$i" will be changed as follows: |
| 40 | 40 |
diff $HOME/"$i" "$i" || true |
| 41 | 41 |
if [ $DRY_RUN -eq 0 ]; then |
| 42 |
- mv $HOME/"$i" $backup_dir |
|
| 42 |
+ mv $HOME/"$i" $backup_dir/"$i" |
|
| 43 | 43 |
# Consider using symbolic links instead |
| 44 | 44 |
# so pulling updates automatically apply |
| 45 |
- cp "$i" $HOME |
|
| 45 |
+ cp "$i" $HOME/"$i" |
|
| 46 | 46 |
fi |
| 47 | 47 |
else |
| 48 | 48 |
echo No change to "$i". |
| 49 | 49 |
fi |
| 50 | 50 |
else |
| 51 | 51 |
echo "$i" will be added to HOME. |
| 52 |
- ((DRY_RUN==0)) && cp "$i" $HOME |
|
| 52 |
+ ((DRY_RUN==0)) && cp "$i" $HOME/"$i" |
|
| 53 | 53 |
fi |
| 54 | 54 |
done |
| 55 | 55 |
|
| 56 | 56 |