X-Git-Url: https://apps.delaporte.us/gitweb/dotfiles.git/blobdiff_plain/d2ca7d9e0c86b833cb4f1bd90cc248ce6f2e6f71..580696958d8e495562caff49efb702d5d3ec1787:/setup_cli_basics.sh?ds=sidebyside

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 949417b..46da273 100755
--- 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