diff --git a/bin/install.sh b/bin/install.sh index 7fb29f2..b57e6d6 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -15,15 +15,9 @@ dir=$DOTFILES_DIR # list of files/folders to symlink in homedir -files="aliases bashrc bash_profile bash_paths bash_prompt exports gemrc gitconfig gitignore hushlogin inputrc private tm_properties npmrc bin" +files="aliases bashrc bash_profile bash_paths bash_prompt exports gemrc gitconfig gitignore hushlogin inputrc private npmrc bin" -# ---------------------------------------------------------------------- -# change to the dotfiles directory -# ---------------------------------------------------------------------- - -cd $dir - # ---------------------------------------------------------------------- # create symlinks from the homedir to any files in the dotfiles directory # specified in $files @@ -51,7 +45,7 @@ echo " Brewing all the things. " echo "=============================================" echo "$(tput sgr0)" # reset -./brew.sh +$dir/brew.sh echo "$(tput setaf 64)" # green echo "---------------------------------------------" @@ -68,7 +62,7 @@ echo " npm all the things. " echo "=============================================" echo "$(tput sgr0)" # reset -./npm.sh +$dir/npm.sh echo "$(tput setaf 64)" # green echo "---------------------------------------------" @@ -85,7 +79,7 @@ echo " Ruby all the things. " echo "=============================================" echo "$(tput sgr0)" # reset -./ruby.sh +$dir/ruby.sh echo "$(tput setaf 64)" # green echo "---------------------------------------------" diff --git a/bin/update-dotfiles.sh b/bin/update-dotfiles.sh index aab1634..5c683b5 100755 --- a/bin/update-dotfiles.sh +++ b/bin/update-dotfiles.sh @@ -15,31 +15,7 @@ dir=$DOTFILES_DIR # list of files/folders to symlink in homedir -files="aliases bashrc bash_profile bash_paths bash_prompt exports gemrc gitconfig gitignore hushlogin inputrc private tm_properties npmrc bin" - - -# ---------------------------------------------------------------------- -# change to the dotfiles directory -# ---------------------------------------------------------------------- - -cd $dir - - -# ---------------------------------------------------------------------- -# pull in changes -# ---------------------------------------------------------------------- - -echo "$(tput setaf 136)" -echo " Getting changes " -echo "=============================================" -echo "$(tput sgr0)" # reset - -#git pull - -echo "$(tput setaf 64)" # green -echo "---------------------------------------------" -echo " ✓ done" -echo "$(tput sgr0)" # reset +files="aliases bashrc bash_profile bash_paths bash_prompt exports gemrc gitconfig gitignore hushlogin inputrc private npmrc bin" # ---------------------------------------------------------------------- @@ -50,6 +26,7 @@ for file in $files; do rm ~/.$file done + # ---------------------------------------------------------------------- # create symlinks from the homedir to any files in the ~/dotfiles directory # specified in $files @@ -60,14 +37,9 @@ for file in $files; do echo "$(tput setaf 64)✓$(tput sgr0) Created symlink to $(tput setaf 37)$file$(tput sgr0)" done + # ---------------------------------------------------------------------- # source what we just created # ---------------------------------------------------------------------- source ~/.bash_profile - - -echo "$(tput setaf 64)" # green -echo "---------------------------------------------" -echo " ✓ all done" -echo "$(tput sgr0)" # reset