projects
/
dotfiles-framework.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ef5e7a
)
Adjusted so that the weekly update actually runs fixup.
author
W. Trevor King
<wking@drexel.edu>
Wed, 26 Nov 2008 18:23:13 +0000
(13:23 -0500)
committer
W. Trevor King
<wking@drexel.edu>
Wed, 26 Nov 2008 18:23:13 +0000
(13:23 -0500)
Previously it only ran update, which syncs ~/.dotfiles with the server.
This would update symlinked stuff, but not localpatches. Now the
patches are reapplied if necessary.
Makefile
patch
|
blob
|
history
_bashrc
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 133f4458cd88c0e0458b9c6a224d4e235b0fc50c..d6b5a47ada0d07f67cbbd48653e16219cb726a53 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-17,7
+17,7
@@
clean:
diff:
git diff
-fixup:
+fixup:
update
./fixup.sh
update:
diff --git
a/_bashrc
b/_bashrc
index 200b2010f991b8cda0990e0342dadedec146d7cc..ff9b6473ff86b92d603317b0a4e3b4cd2e8f91a3 100644
(file)
--- a/
_bashrc
+++ b/
_bashrc
@@
-192,7
+192,7
@@
if [ -d ~/.dotfiles/ ]; then
rm -f ~/.dotfiles/updated.* 2>/dev/null
touch ~/.dotfiles/updated.`date +%U`
pushd ~/.dotfiles
- make
update
+ make
fixup
popd
fi
fi