From 5ccd0e216773a7ad2276c5283fd1b43e9940af53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Wed, 12 Jun 2019 22:16:42 +0200
Subject: [PATCH] [util-iso.sh] fix snap values

---
 lib/util-iso.sh | 6 +++---
 lib/util.sh     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 9dd6aef..d5affb6 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -244,10 +244,10 @@ reset_pac_conf(){
 #  * https://blackboxsw.github.io/seed-snaps-using-maas.html
 function seed_snaps() {
     local SEED_DIR="/var/lib/snapd/seed"
-    local SEED_CHANNEL="${SEED_CHANNEL_ISO}"
-    local SEED_SNAPS="${STRICT_SNAPS} ${CLASSIC_SNAPS}"
+    local SEED_CHANNEL="${seed_channel}"
+    local SEED_SNAPS="${strict_snaps} ${classic_snaps}"
 
-    if [[ -n "${STRICT_SNAPS}" ]] || [[ -n "${CLASSIC_SNAPS}" ]]; then
+    if [[ -n "${strict_snaps}" ]] || [[ -n "${classic_snaps}" ]]; then
         msg2 "Installing snaps: %s" ${SEED_SNAPS}
         # Preseeded snaps should be downloaded from a versioned channel
         rm -rfv "$1/${SEED_DIR}"
diff --git a/lib/util.sh b/lib/util.sh
index fb07c53..d5ca76c 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -404,9 +404,9 @@ load_profile_config(){
     [[ -z ${autologin} ]] && autologin="true"
     [[ ${displaymanager} == 'none' ]] && autologin="false"
 
-    [[ -z ${strict_snaps} ]] && STRICT_SNAPS=""
-    [[ -z ${classic_snaps} ]] && CLASSIC_SNAPS=""
-    [[ -z ${snap_channel} ]] && SNAP_CHANNEL_ISO="stable"
+    [[ -z ${strict_snaps} ]] && strict_snaps=""
+    [[ -z ${classic_snaps} ]] && classic-snaps=""
+    [[ -z ${snap_channel} ]] && snap_channel="stable"
 
     [[ -z ${multilib} ]] && multilib="true"