From 821e93cbc748958244de8a145211432056b7feb7 Mon Sep 17 00:00:00 2001
From: Leap Admins <sysdev@leap.se>
Date: Mon, 15 Jul 2013 09:50:04 +0000
Subject: minor enhancments

---
 README.md          |  3 +++
 leap-platform-test | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 66f61c3..06792e9 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,9 @@ Setup example provider
 ** saves the initialized node (leap local save)
 ** takes ~6 mins to bootstrap one node, depending on how many updates are available.
 
+* If you want to put the provider into version control, there's already a .gitignore.example
+  put in the provider directory you can use.
+
 Deploy nodes
 ------------
 
diff --git a/leap-platform-test b/leap-platform-test
index 44c21b2..e71328d 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -78,7 +78,7 @@ create_provider() {
   cd $PROVIDERDIR
 
   # for now, we use the vagrant pubkey until https://leap.se/code/issues/2039 is solved
-  $LEAP_CMD $OPTS add-user --self --ssh-pub-key=/usr/lib/ruby/gems/1.9.1/gems/leap_cli-0.2.1/vendor/vagrant_ssh_keys/vagrant.pub
+  $LEAP_CMD $OPTS add-user --self --ssh-pub-key=$SSHKEY
   $LEAP_CMD $OPTS cert ca && leap cert csr
 
   $LEAP_CMD $OPTS cert dh
@@ -182,7 +182,7 @@ wait_for_node() {
 }
 
 update_leap_cli () {
-  cd /usr/local/src/leap_cli
+  cd $LEAP_SRC
   git fetch
   git reset origin/vagrant_1.2 --hard 
 }
@@ -198,7 +198,7 @@ versions () {
   platform_head=`git rev-parse HEAD`
   platform_commit=`git show | head -5`
 
-  cd $LEAP_CLI_DIR
+  cd $LEAP_SRC
   cli_head=`git rev-parse HEAD`
   if cli_head='edcb76a30bc0e13b9bf590cbd9f7f12d41a2cc13'
   then
@@ -287,6 +287,7 @@ source $config
 # common config for all providers
 source /etc/leap/platform-test-common.cfg
 
+
 [ -e $PROVIDERDIR ] && cd  $PROVIDERDIR
 
 if $print_versions
@@ -297,9 +298,9 @@ then
   exit 0
 fi
 
-if [ -z $LEAP_CMD ] 
+if [ -z $LEAP_CMD -o -z $LEAP_SRC ] 
 then
-  echo "please provide a path to the leap_cli binary in the config file, using the LEAP_CMD var."
+  echo "please provide a path to the leap_cli binary and the source in the config file, using the LEAP_CMD and LEAP_SRC var."
   exit 1
 fi
 
-- 
cgit v1.2.3