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

Made update script load and run latest update code

Browse Source
This commit is contained in:
Nathan Broadbent
2011-10-19 18:09:13 +08:00
parent 72dec92d35
commit 7328c32b9a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/scm_breeze.sh
View File

@@ -16,9 +16,13 @@ update_scm_breeze() {
cd "$scmbDir" cd "$scmbDir"
oldHEAD=$(git rev-parse HEAD 2> /dev/null) oldHEAD=$(git rev-parse HEAD 2> /dev/null)
git pull origin master git pull origin master
# Reload latest version of '_create_or_patch_scmbrc' function
source "$scmbDir/lib/scm_breeze.sh" source "$scmbDir/lib/scm_breeze.sh"
_create_or_patch_scmbrc
cd "$currDir"
}
_create_or_patch_scmbrc() {
# Create or attempt to patch '~/.*.scmbrc' files. # Create or attempt to patch '~/.*.scmbrc' files.
patchfile=$(mktemp) patchfile=$(mktemp)
for scm in git; do for scm in git; do
@@ -38,9 +42,9 @@ update_scm_breeze() {
echo -e "== Please look at the following changes and manually update '~/.$scm.scmbrc', if necessary.\n" echo -e "== Please look at the following changes and manually update '~/.$scm.scmbrc', if necessary.\n"
cat "$HOME/.$scm.scmbrc.rej" cat "$HOME/.$scm.scmbrc.rej"
fi fi
cd "$scmbDir"
fi fi
fi fi
done done
cd "$currDir"
} }