From 386212b8728f7187735e3203e0ed95f66ffadc29 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki <cyplo@cyplo.net>
Date: Tue, 1 Nov 2016 14:35:53 +0100
Subject: [PATCH] Use gpg isntead of gpg2 when necessary

---
 common/configure_fresh_system | 15 ++++++++++++++-
 windows/build_insider.sh      |  8 +++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index 011f0f88..9669f730 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -105,8 +105,21 @@ set +e
 set -e
 fi
 
+set +e
+echo "Querying for gpg2 path"
+gpg2_path=`which gpg2`
+echo "Got $gpg2_path for gpg2 path"
+echo set -e
+if [[ -x gpg2_path ]]; then 
+    echo "Using gpg2"
+    GPG=gpg2
+else
+    echo "WARNING using gpg instead of gpg2"
+    GPG=gpg
+fi
+
 if [[ -z $NORUBY ]]; then
-    gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+    $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
     curl -sSL https://get.rvm.io | bash -s stable --ruby
 fi
 
diff --git a/windows/build_insider.sh b/windows/build_insider.sh
index 26c9859b..6a6fc74c 100644
--- a/windows/build_insider.sh
+++ b/windows/build_insider.sh
@@ -4,17 +4,19 @@ set -e
 
 DOTFILES_PATH="$HOME/dev/dotfiles"
 mkdir -pv $HOME/dev/
-rm -fr $DOTFILES_PATH
 
-git clone "$OUTER_CLONE" "$DOTFILES_PATH"
+if [[ ! -d $DOTFILES_PATH ]]; then
+    git clone "$OUTER_CLONE" "$DOTFILES_PATH"
+fi
+
 cd "$DOTFILES_PATH"
 git remote set-url origin git@github.com:cyplo/dotfiles.git
 git checkout $branch
+git pull
 
 export NOSUDO=true
 export DONT_CHANGE_SHELL=true
 export NORUST=true
-export NORUBY=true
 export NO_GO=true
 export DIR=$DOTFILES_PATH 
 export NOYCM=true