This commit is contained in:
Jonas Forsberg 2020-08-01 13:43:02 +02:00
parent 3f4aeda4ad
commit 3eaf6ebbef
No known key found for this signature in database
GPG Key ID: F2E9818C70350CC9

View File

@ -12,11 +12,11 @@ set -aeo pipefail
function new_log(){ function new_log(){
# script output # script output
printf "[*] - $*\n" echo "\n**** [$*] ***"
} }
function log(){ function log(){
printf " $*\n" echo "$*"
} }
function gnome_key_bindings(){ function gnome_key_bindings(){
@ -41,16 +41,15 @@ function setup_dotfiles(){
log "adding remote repo ($DOTFILES_REMOTE)" log "adding remote repo ($DOTFILES_REMOTE)"
$dotf remote add origin "$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 if [[ -f "$HOME/.bachrc" ]];then
log "renaming local .bashrc to .bashrc.bak" log "renaming local .bashrc to .bashrc.bak"
mv "$HOME/.bashrc" "$HOME/.bashrc.bak" mv "$HOME/.bashrc" "$HOME/.bashrc.bak"
fi fi
log "pulling dotfiles" log "fetching dotfiles"
$dotf pull $dotf fetch origin
$dotf checkout master
} }
setup_dotfiles setup_dotfiles