From 76a9ee333741f3834bd8fe03e490aeba724fef96 Mon Sep 17 00:00:00 2001
From: Paul Sherwood <paul.sherwood@codethink.co.uk>
Date: Thu, 9 Oct 2014 20:09:31 +0000
Subject: Tidy up a bit, and don't let user run this in TEST system

---
 scripts/cycle.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cycle.sh b/scripts/cycle.sh
index 8fab43b7..3d1b45fe 100755
--- a/scripts/cycle.sh
+++ b/scripts/cycle.sh
@@ -29,15 +29,22 @@ if [ -z "$1" ] || [ -z "$2" ] ; then
     exit 1
 fi
 
+if [ `system-version-manager get-running | grep ^TEST$` ]; then
+  echo "You are currently running the TEST system."
+  echo "Maybe you want to boot into a different system version?"
+  exit 1
+fi
+
 set -e
 set -v
 
+system-version-manager set-default factory              
+if [ `system-version-manager list | grep ^TEST$` ]; then
+  system-version-manager remove TEST                                       
+fi 
+
 morph gc
 morph build $1
-system-version-manager set-default factory
-if [ `system-version-manager list | grep ^TEST$` ]; then
-  system-version-manager remove TEST
-fi
 
 sed -i "s|^- morph: .*$|- morph: $1|" $2
 morph deploy --upgrade $2 self.HOSTNAME=$(hostname) self.VERSION_LABEL=TEST
-- 
cgit v1.2.1