flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #147 from keen99/patch-1

Browse Source 
_create_or_patch_scmbrc is not noclobber safe
This commit is contained in:
Nathan Broadbent
2014-07-08 13:09:40 -07:00
parent 3e09624f8a a1afeef0c4
commit 47111d274d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/scm_breeze.sh
View File

@@ -48,7 +48,7 @@ _create_or_patch_scmbrc() {
# If file exists, attempt to update it with any new settings
elif [ -n "$1" ]; then
# Create diff of example file, substituting example file for user's config.
git diff $1 "$prefix""scmbrc.example" | sed "s/$prefix""scmbrc.example/.$prefix""scmbrc/g" > $patchfile
git diff $1 "$prefix""scmbrc.example" | sed "s/$prefix""scmbrc.example/.$prefix""scmbrc/g" >| $patchfile
if [ -s $patchfile ]; then # If patchfile is not empty
cd "$HOME"
# If the patch cannot be applied cleanly, show the updates and tell user to update file manually.