From 7b003cc8322c81746a7845672b535d656ccc20b5 Mon Sep 17 00:00:00 2001
From: Mykola Malkov <mmalkov@sipwise.com>
Date: Mon, 19 Mar 2018 17:24:20 +0100
Subject: [PATCH] TT#32751 Remove 'daily' disk type

We don't need 'daily' disk type anymore
Remove usage of 1st parameter of build_iso.sh - it is kept only
for backward compatibility

GRML_URL and GRML_HASH_URL can be redefined to support build
from the latest grml image

Change-Id: I6e4ec2754965775fa2437bdc658049a7be5aede3
---
 build_iso.sh | 49 +++++++++++++++++--------------------------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/build_iso.sh b/build_iso.sh
index e62aaf3..16a436c 100755
--- a/build_iso.sh
+++ b/build_iso.sh
@@ -4,15 +4,19 @@ set -e
 
 DATE="$(date +%Y%m%d_%H%M%S)"
 WGET_OPT="--timeout=30 -q -c"
-RELEASE="$1"
+# First (former RELEASE) parameter isn't used but kept for backward compatibility
+_="$1"
 GRML_ISO="$2"
 MR="$3"
 DIST="$4"
 TEMPLATES="templates"
+GRML_URL="${GRML_URL:-https://deb.sipwise.com/files/grml/}"
+GRML_HASH_URL="${GRML_HASH_URL:-http://download.grml.org/}"
+SIPWISE_ISO="sip_provider_${MR}_${DATE}.iso"
 
 usage () {
-  echo "Usage: $0 daily|private|public <grml.iso> <mr version> <Debian dist>"
-  echo "Sample: $0 'daily' 'grml64-full_testing_latest.iso' mr6.2.1 stretch"
+  echo "Usage: $0 compat <grml.iso> <mr version> <Debian dist>"
+  echo "Sample: $0 compat 'grml64-full_2014.11.iso' mr6.2.1 stretch"
   exit 1
 }
 
@@ -22,6 +26,7 @@ check_sha1 () {
   sha1sum -c "${_GRML_ISO}.sha1"
 }
 
+
 if [ -z "${MR}" ]; then
   echo "Parameter <mr version> is missing" >&2
   usage
@@ -30,29 +35,6 @@ elif [ -z "${DIST}" ]; then
   usage
 fi
 
-echo "*** Building ${RELEASE} ISO ***"
-
-case ${RELEASE} in
-daily)
-  SIPWISE_ISO="grml64-sipwise-daily_${DATE}.iso"
-  GRML_URL="http://daily.grml.org/grml64-full_testing/latest/"
-  GRML_HASH_URL="${GRML_URL}"
-  ;;
-private)
-  SIPWISE_ISO="grml64-sipwise-release_${DATE}.iso"
-  GRML_URL="https://deb.sipwise.com/files/grml/"
-  GRML_HASH_URL="http://download.grml.org/"
-  ;;
-public)
-  SIPWISE_ISO="sip_provider_CE_installcd.iso"
-  GRML_URL="https://deb.sipwise.com/files/grml/"
-  GRML_HASH_URL="http://download.grml.org/"
-  ;;
-*)
-  usage
-  ;;
-esac
-
 if [ "${GRML_ISO}" != "" ]; then
   if [[ "${GRML_ISO}" =~ ^devel/.*\.iso$ ]]; then
     GRML_URL+="devel/"
@@ -63,23 +45,25 @@ else
   usage
 fi
 
-echo "*** Retrieving Grml ${RELEASE} ISO [${GRML_ISO}] ***"
+echo "*** Building ${MR} ISO ***"
+
+echo "*** Retrieving Grml ISO [${GRML_ISO}] ***"
 # shellcheck disable=SC2086
 wget ${WGET_OPT} -O "${GRML_ISO}" "${GRML_URL}${GRML_ISO}"
 # shellcheck disable=SC2086
 wget ${WGET_OPT} -O "${GRML_ISO}.sha1" "${GRML_HASH_URL}${GRML_ISO}.sha1"
 
-if [ "${RELEASE}" = "daily"  ]; then
+if grep -q "${GRML_ISO}" "${GRML_ISO}.sha1" ; then
+  check_sha1 "${GRML_ISO}"
+else
   echo "*** Renaming Grml ISO (from the latest to exact build version) ***"
   # identify ISO version (build time might not necessarily match ISO date)
   ISO_DATE=$(isoinfo -d -i "${GRML_ISO}" | awk '/^Volume id:/ {print $4}')
-  if [ -z "${ISO_DATE}" ] ; then echo "ISO_DATE not identified, exiting." >&2 ; exit 1 ; fi
+  if [ -z "${ISO_DATE}" ]; then echo "ISO_DATE not identified, exiting." >&2 ; exit 1 ; fi
   GRML_ISO_DATE="grml64-full_testing_${ISO_DATE}.iso"
   mv "${GRML_ISO}" "${GRML_ISO_DATE}"
   check_sha1 "${GRML_ISO}"
   GRML_ISO="${GRML_ISO_DATE}"
-else
-  check_sha1 "${GRML_ISO}"
 fi
 
 # build grub.cfg release options
@@ -101,4 +85,5 @@ sha1sum "${SIPWISE_ISO}" > "${SIPWISE_ISO}.sha1"
 md5sum  "${SIPWISE_ISO}" > "${SIPWISE_ISO}.md5"
 
 mkdir -p artifacts
-mv "${SIPWISE_ISO}" ${SIPWISE_ISO}.sha1 ${SIPWISE_ISO}.md5 artifacts/
+echo "*** Moving ${SIPWISE_ISO} ${SIPWISE_ISO}.sha1 ${SIPWISE_ISO}.md5 to artifacts/ ***"
+mv "${SIPWISE_ISO}" "${SIPWISE_ISO}.sha1" "${SIPWISE_ISO}.md5" artifacts/