Use `files` path to PowerShell profile

[dotfiles.git] / setup_cli_basics.sh

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 949417b0930ccd7ff72e483b36033a8b1a4f028e..46da273520f83fd385d933a8525d4a51f4619e7f 100755 (executable)
--- a/setup_cli_basics.sh
+++ b/setup_cli_basics.sh
@@ -3,6 +3,11 @@ if [ ! -d ~/dotfiles ]; then
        cd ~; git clone git@github.com:edthedev/dotfiles.git
 fi
 
+if [ ! -f ~/.bashrc ]; then
+       echo "************** Setup Bash"
+       ~/dotfiles/setup/bash.sh
+fi
+
 if [ ! -f ~/.screenrc ]; then
        echo "************** Setup Screen"
        ln -s ~/dotfiles/files/screenrc ~/.screenrc
@@ -19,6 +24,7 @@ if [ -f ~/.gitconfig ]; then
        echo "************** Configure Git user"
        git config --global user.email "edward@delaporte.us"
        git config --global user.name "Edward Delaporte"
+       git config --global pull.ff only
 fi
 
 if [ ! -f ~/.ssh/id_ed25519 ]; then
@@ -26,7 +32,7 @@ if [ ! -f ~/.ssh/id_ed25519 ]; then
        ssh-keygen -t ed25519
 
        echo "************** Reminder to setup GitHub key"
-       cat GitHubKey.md
+       cat ~/dotfiles/doc/GitHubKey.md
        cat ~/.ssh/id_rsa.pub
 fi