From ff83b5fb0e13b57beaea7ebd880add498638f3bd Mon Sep 17 00:00:00 2001
From: Ian Gulliver <flamingcow@gmail.com>
Date: Thu, 31 Mar 2016 11:23:40 -0700
Subject: [PATCH] Split out utility script

---
 client/fetch_and_update.sh | 13 +++++++++++++
 client/run                 | 10 +---------
 2 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100755 client/fetch_and_update.sh

diff --git a/client/fetch_and_update.sh b/client/fetch_and_update.sh
new file mode 100755
index 0000000..d2d9a0c
--- /dev/null
+++ b/client/fetch_and_update.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -ex
+
+IMAGES=/isodevice/iconograph
+mkdir -p "${IMAGES}"
+
+BOOT=/isodevice
+
+FLAGS=$(cat flags)
+
+./fetcher.py --image-dir="${IMAGES}" --ca-cert=../config/ca.cert.pem ${FLAGS}
+./update_grub.py --image-dir="${IMAGES}" --boot-dir="${BOOT}" > ${BOOT}/grub/grub.cfg.tmp && mv ${BOOT}/grub/grub.cfg.tmp ${BOOT}/grub/grub.cfg
diff --git a/client/run b/client/run
index 5f044cc..28ffa7b 100755
--- a/client/run
+++ b/client/run
@@ -7,15 +7,7 @@ exec 2>&1
 # Mitigate crash looping
 sleep 60
 
-IMAGES=/isodevice/iconograph
-mkdir -p "${IMAGES}"
-
-BOOT=/isodevice
-
-FLAGS=$(cat flags)
-
 while :; do
-  ./fetcher.py --image-dir="${IMAGES}" --ca-cert=../config/ca.cert.pem ${FLAGS}
-  ./update_grub.py --image-dir="${IMAGES}" --boot-dir="${BOOT}" > ${BOOT}/grub/grub.cfg.tmp && mv ${BOOT}/grub/grub.cfg.tmp ${BOOT}/grub/grub.cfg
+  ./fetch_and_update.sh
   sleep 3600
 done