From 7328c32b9af5650201b83f0d06e35f2b51963835 Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Wed, 19 Oct 2011 18:09:13 +0800 Subject: [PATCH] Made update script load and run latest update code --- lib/scm_breeze.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/scm_breeze.sh b/lib/scm_breeze.sh index 43f972c..b68f883 100644 --- a/lib/scm_breeze.sh +++ b/lib/scm_breeze.sh @@ -16,9 +16,13 @@ update_scm_breeze() { cd "$scmbDir" oldHEAD=$(git rev-parse HEAD 2> /dev/null) git pull origin master - + # Reload latest version of '_create_or_patch_scmbrc' function source "$scmbDir/lib/scm_breeze.sh" + _create_or_patch_scmbrc + cd "$currDir" +} +_create_or_patch_scmbrc() { # Create or attempt to patch '~/.*.scmbrc' files. patchfile=$(mktemp) 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" cat "$HOME/.$scm.scmbrc.rej" fi + cd "$scmbDir" fi fi done - cd "$currDir" }