From 4698fb8ac63ab5c8383b3434974174d21122052d Mon Sep 17 00:00:00 2001 From: steveokard Date: Wed, 22 Jan 2020 11:29:54 -0500 Subject: [PATCH] more testing cases --- emacs_doom.zsh | 18 ++++++++++++------ init.sh | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/emacs_doom.zsh b/emacs_doom.zsh index 9352132..41cf630 100755 --- a/emacs_doom.zsh +++ b/emacs_doom.zsh @@ -1,17 +1,23 @@ #!/bin/zsh #This will install Doom for Emacs - -if [ -e ~/.emacs.d/spacemacs.mk ] -#cleanup old spacemacs - mv ~/.emacs.d ~/spacemacs.d -else - git clone https://github.com/hlissner/doom-emacs ~/.emacs.d +#which version of ubuntu are we on? +if [ `lsb_release -rs` -lt 19 ] #needs to be an int vs int + echo "Forget it! You'll have to install an updated version of emacs" + exit 1 fi +#cleanup old spacemacs +if [ -e ~/.emacs.d/spacemacs.mk ] + mv ~/.emacs.d ~/spacemacs.d +fi + +git clone https://github.com/hlissner/doom-emacs ~/.emacs.d + #Test for ripgrep if [ -e /usr/bin/rg ] ~/.emacs.d/bin/doom install else echo "Ripgrep not detected, attempting to install!" sudo apt install ripgrep + echo "if successful, install emacs doom via script ~/.emacs.d/bin/doom install" fi diff --git a/init.sh b/init.sh index ae8f299..53d34f5 100755 --- a/init.sh +++ b/init.sh @@ -19,7 +19,9 @@ mkdir ~/.ssh echo "Stowing Configs" stow tmux stow vim +#Defer until prezto.zsh completes? stow prezto +# stow config chmod 0700 ~/.ssh chmod -R 0600 ~/.ssh/*