Updated bootstrap for WSL

diff --git a/README.md b/README.md
index afee5820b7f1817179f4b5f4875100e8759f744d..faadbd4dd965c94b0f69a43aca47fdd9ae7b0aa5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 My Linux dot files.
 
 # Setup
-Copy the file `bootstrap.sh` to the destination system.
+Copy the file `setup.sh` to the destination system.
 Source it there.
 
-Make sure your shell is set to Zshell.
+Make sure your shell is set to PowerShell

diff --git a/bootstrap.sh b/bootstrap.sh
index 561e90f1256b893c39c65855a413dc52a8ad95a5..acd0ba8d28476387d49ab33eaf43276582c7c9eb 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -8,33 +8,57 @@
 # You can scp just this file to the destination host,
 #   and then run it.
 
-if [ ! -f ~/.ssh/id_rsa ]; then
-       ssh-keygen
-fi
+# sudo apt-get install zsh
+# TODO: CURL me...
 
+## Setup Git and Vim
 if [ ! -d ~/dotfiles ]; then
+       sudo apt-get install git install vim
+       # TODO: Consider vim-nox to resolve 'needs python' error from some of my vundle plugins.
+       git config --global user.email "edward@delaporte.us"
+       git config --global user.name "Edward Delaporte"
+       git config --global core.editor /usr/bin/vim
        cd ~; git clone git@github.com:edthedev/dotfiles.git
-       cp ~/dotfiles/id_rsa.pub ~/id_rsa.pub
-       chmod go+r ~/id_rsa.pub
 fi
-
-if [ ! -f ~/.zshrc ]; then
-       ln -s ~/dotfiles/zshrc ~/.zshrc
+if [ ! -f ~/.vimrc ]; then
+       ln -s ~/dotfiles/vimrc ~/.vimrc
 fi
 
-if [ ! -f ~/.screenrc ]; then
-       ln -s ~/dotfiles/screenrc ~/.screenrc
+## Setup PowerShell
+if [ ! -f ~/.config/powershell/Microsoft.PowerShell_profile.ps1 ]; then
+       sudo apt-get install powershell
+       chsh --shell /usr/bin/pwsh
+       mkdir -p /home/delaport/.config/powershell/
+       ln -s ~/dotfiles/Microsoft.PowerShell_profile.ps1 ~/.config/powershell/Microsoft.PowerShell_profile.ps1 
 fi
 
-if [ ! -f ~/dotfiles/antigen/README.md ]; then
-       cd ~/dotfiles;git submodule update --init
+## Create SSH Keys
+if [ ! -f ~/.ssh/id_rsa ]; then
+       ssh-keygen
 fi
 
-if [ ! -f ~/.vimrc ]; then
-       ln -s ~/dotfiles/vimrc ~/.vimrc
+## Setup Remote Access
+# if [ ! -f ~/id_rsa.pub ]; then
+#      cp ~/dotfiles/id_rsa.pub ~/id_rsa.pub
+#      chmod go+r ~/id_rsa.pub
+# fi
+
+## Setup ZShell Profile
+# if [ ! -f ~/.zshrc ]; then
+#      ln -s ~/dotfiles/zshrc ~/.zshrc
+# fi
+# if [ ! -f ~/dotfiles/antigen/README.md ]; then
+#      cd ~/dotfiles;git submodule update --init
+# fi
+
+## Setup Screen
+if [ ! -f ~/.screenrc ]; then
+       sudo apt-get install screen
+       ln -s ~/dotfiles/screenrc ~/.screenrc
 fi
 
+## Setup Vundle for Vim
 if [ ! -d ~/.vim/bundle ]; then
-       git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+       git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
        vim +BundleInstall +qall
 fi

diff --git a/setup.sh b/setup.sh
deleted file mode 100644 (file)
index da98b14..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# This setup script is for Kali Linux running under Linux subsystem for Windows
-# Because yeah, I'm **that** guy.
-## It makes total sense, I swear.
-
-# Setup git
-sudo apt-get install git install vim
-git config --global user.email "edward@delaporte.us"
-git config --global user.name "Edward Delaporte"
-git config --global core.editor /usr/bin/vim
-
-# Setup PowerShell
-sudo apt-get install powershell
-chsh --shell /usr/bin/pwsh
-mkdir -p /home/delaport/.config/powershell/
-ln -s ~/dotfiles/Microsoft.PowerShell_profile.ps1 ~/.config/powershell/Microsoft.PowerShell_profile.ps1