summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2009-07-05 17:09:57 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2009-07-05 17:09:57 +0200
commit74f428e564d09cb9c8d9c5de8c17f5e169d7b6f6 (patch)
tree00e67e81125534906926b91bd930cb13e218a246
parent09f5ee1da84eb3d48ca7723faa42d3c29d94da08 (diff)
downloaddotfiles-74f428e564d09cb9c8d9c5de8c17f5e169d7b6f6.tar.gz
dotfiles-74f428e564d09cb9c8d9c5de8c17f5e169d7b6f6.tar.xz
dotfiles-74f428e564d09cb9c8d9c5de8c17f5e169d7b6f6.zip
removed trailing whitespaces
-rw-r--r--bashrc/main.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/bashrc/main.sh b/bashrc/main.sh
index b2edc14..c939a2e 100644
--- a/bashrc/main.sh
+++ b/bashrc/main.sh
@@ -15,17 +15,17 @@ cd "${HOME}"
# self update magic
_self_update() {
pushd ${_DOTFILES_DIR} &>/dev/null
-
+
git fetch origin 2>/dev/null
if [[ -n "$(git whatchanged HEAD..origin/master)" ]]; then
echo -ne "\033[31m*\033[0m dotfile updates found, merge now? (Y/n) "
read _merge;
if [[ $_merge != 'n' ]]; then
git merge origin/master
-
+
if [[ -e management/symlinks.md5 ]]; then
md5sum -c management/symlinks.md5 --status 2>/dev/null
-
+
if [[ $? -ne 0 ]]; then
echo -e "\033[33m*\033[0m symlink mapping changed!"
echo -e "\033[33m*\033[0m Maybe you should execute godot.sh again..."