Merge branch 'main' of github.com:edthedev/dotfiles into main

[dotfiles.git] / setup_cli_basics.sh

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 10bb145b7e46dd1b1a9f5570dcae93c5e5fcfdcc..1633f5f9ff83d12a634e535cc61a75cef1d72473 100755 (executable)
--- a/setup_cli_basics.sh
+++ b/setup_cli_basics.sh
@@ -3,33 +3,42 @@ if [ ! -d ~/dotfiles ]; then
        cd ~; git clone git@github.com:edthedev/dotfiles.git
 fi
 
        cd ~; git clone git@github.com:edthedev/dotfiles.git
 fi
 

-if [ ! -f ~/.screenrc ]; then
-       echo "************** Setup Screen"
-       ln -s ~/dotfiles/screenrc ~/.screenrc
-fi
-
-if [ ! -f ~/.vimrc ]; then
-       echo "************** Link Vimrc"
-       ln -s ~/dotfiles/vimrc ~/.vimrc
+if [ ! -f ~/.bashrc ]; then
+       echo "************** Setup Bash"
+       ~/dotfiles/setup/bash.sh

 fi
 
 fi
 

-if [ -f ~/.vimrc ]; then
-       echo "************** Configure Git to use Vim"
-       git config --global core.editor /usr/bin/vim
+if [ ! -f ~/.screenrc ]; then
+       echo "************** Setup Screen"
+       ln -s ~/dotfiles/files/screenrc ~/.screenrc

 fi
 
 fi
 

-if [ -f ~/.gitconfig ]; then
+if [ ! -f ~/.gitconfig ]; then

        echo "************** Configure Git user"
        git config --global user.email "edward@delaporte.us"
        git config --global user.name "Edward Delaporte"
        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
+       git config --global core.editor /usr/bin/vi
+fi
+
+if [ ! -f ~/.vimrc ]; then
+       echo "************** Link Vimrc"
+       ln -s ~/dotfiles/files/vimrc ~/.vimrc
+       ls -a ~ | grep vim

 fi
 
 fi
 

-if [ ! -f ~/.ssh/id_rsa ]; then
+if [ ! -f ~/.ssh/id_ed25519 ]; then

        echo "************** Generate an SSH key"
        echo "************** Generate an SSH key"

-       ssh-keygen
+       ssh-keygen -t ed25519

 
        echo "************** Reminder to setup GitHub key"
 
        echo "************** Reminder to setup GitHub key"

-       cat GitHubKey.md
-       cat ~/.ssh/id_rsa.pub
+       cat ~/dotfiles/doc/GitHubKey.md
+       cat ~/.ssh/id_ed25519.pub

 fi
 
 fi
 

+echo "************** Status: Symlinks "
+ls -la ~ | grep "\->"
+echo "************** Status: Git Config"
+cat ~/.gitconfig
+echo "************** Status: Pubkey "
+cat ~/.ssh/id_ed25519.pub
\ No newline at end of file