From 02dc964dcbc75a36b5e1470c94ae7eec5cd8aabb Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Fri, 12 Feb 2016 13:23:19 +0000
Subject: mason: Fix scripts to not use morph init/checkout

https://storyboard.baserock.org/#!/story/71

Change-Id: Iaed10e9edb66f92fd35d61601c06f496c2bea5f3
---
 extensions/mason/mason.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'extensions')

diff --git a/extensions/mason/mason.sh b/extensions/mason/mason.sh
index a548bc32..6f2a62b1 100755
--- a/extensions/mason/mason.sh
+++ b/extensions/mason/mason.sh
@@ -11,14 +11,9 @@ set -x
 # Load our deployment config
 . /etc/mason.conf
 
-if [ ! -e ws ]; then
-    morph init ws
-fi
-cd ws
-
-definitions_repo="$DEFINITIONS_REF"/"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions
+definitions_repo=mason-definitions-"$DEFINITIONS_REF"
 if [ ! -e "$definitions_repo" ]; then
-    morph checkout git://"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions "$DEFINITIONS_REF"
+    git clone -b "$DEFINITIONS_REF" git://"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions "$definitions_repo"
     cd "$definitions_repo"
     git config user.name "$TROVE_ID"-mason
     git config user.email "$TROVE_ID"-mason@$(hostname)
-- 
cgit v1.2.1