From 8b15d5cd434fb01cc31a26f3dd2e4c1e97c6821b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 20 Jan 2019 13:29:16 +0000
Subject: [PATCH] cleanup the common script

---
 common/configure_fresh_system.sh | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/common/configure_fresh_system.sh b/common/configure_fresh_system.sh
index 5265b163..e7510ea4 100755
--- a/common/configure_fresh_system.sh
+++ b/common/configure_fresh_system.sh
@@ -7,13 +7,14 @@ if [[ -z $NOSUDO ]]; then
     SUDO="sudo"
 fi
 
-echo "using '$SUDO' as sudo"
-
-set -e
 echo
 echo "configuring settings common among OSes"
+echo "using '$SUDO' as sudo"
 $SUDO true
 
+echo "sourcing env"
+source ~/.setenv
+
 #zsh
 if [[ -z $DONT_CHANGE_SHELL ]]; then
     echo "changing shell to zsh"
@@ -63,16 +64,16 @@ ln -vfs "$DIR/.config/Code/User/settings.json" ~/.config/Code/User/settings.json
 ln -vfs "$DIR/.config/Code/User/keybindings.json" ~/.config/Code/User/keybindings.json
 mkdir -p ~/.local/share/applications
 cp -v "$DIR/keeweb.desktop" ~/.local/share/applications/
-
+ln -vfs "$DIR/tools" ~/
+mkdir -vp ~/.config/terminator
+rm -f ~/.config/terminator/config
+ln "$DIR/.config/terminator/config" ~/.config/terminator/config
 mkdir -p ~/.cargo/
 echo "all links done"
 
 echo "adding NVM"
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash
 
-echo "sourcing env"
-source ~/.setenv
-
 echo "using NVM"
 set +e
 \. "$NVM_DIR/nvm.sh"
@@ -80,15 +81,8 @@ set -e
 nvm install node
 nvm use node
 
-# tools
-ln -vfs "$DIR/tools" ~/
-
-# stuff that does not like symbolic links
-mkdir -vp ~/.config/terminator
-rm -f ~/.config/terminator/config
-ln "$DIR/.config/terminator/config" ~/.config/terminator/config
-
 #install fonts
+echo "installing fonts"
 mkdir -p ~/.fonts
 cp -rv "$DIR/fonts" ~/.fonts
 set +e
@@ -96,7 +90,9 @@ fc-cache -rv
 $SUDO fc-cache -rv
 set -e
 
-source "$DIR/common/install_vim_from_sources.sh"
+if [[ -z $NOVIM ]]; then
+    source "$DIR/common/install_vim_from_sources.sh"
+fi
 
 if [[ -z $NORUST ]]; then
     #rust