diff --git a/bin/initDesktop b/bin/initDesktop index 125aa14..15d939e 100755 --- a/bin/initDesktop +++ b/bin/initDesktop @@ -12,11 +12,11 @@ set -aeo pipefail function new_log(){ # script output - printf "[*] - $*\n" + echo "\n**** [$*] ***" } function log(){ - printf " $*\n" + echo "$*" } function gnome_key_bindings(){ @@ -41,16 +41,15 @@ function setup_dotfiles(){ log "adding remote repo ($DOTFILES_REMOTE)" $dotf remote add origin "$DOTFILES_REMOTE" - $dotf branch --set-upstream-to=origin/master master - $dotf pull.ff only if [[ -f "$HOME/.bachrc" ]];then log "renaming local .bashrc to .bashrc.bak" mv "$HOME/.bashrc" "$HOME/.bashrc.bak" fi - log "pulling dotfiles" - $dotf pull + log "fetching dotfiles" + $dotf fetch origin + $dotf checkout master } setup_dotfiles