root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-iso.sh] fix snap_channel variable

Browse source
This commit is contained in:
Philip Müller 2019-06-13 00:42:24 +02:00
parent ebe6012dbe
commit a90199a176
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/buildiso.in
View file

@ -49,6 +49,7 @@ show_profile(){
msg2 "strict_snaps: %s" "${strict_snaps}"
msg2 "classic_snaps: %s" "${classic_snaps}"
msg2 "snap_channels: %s" "${snap_channel}"
fi
reset_profile
}

6
lib/util-iso.sh
View file

@ -244,7 +244,7 @@ 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}"
local SEED_CHANNEL="${snap_channel}"
local SEED_SNAPS="${strict_snaps} ${classic_snaps}"
if [[ -n "${strict_snaps}" ]] || [[ -n "${classic_snaps}" ]]; then
@ -257,10 +257,10 @@ function seed_snaps() {
# Runs inside the container
for SEED_SNAP in ${SEED_SNAPS}; do
if [[ "${SEED_SNAP}" == "core" ]] || [[ "${SEED_SNAP}" == "core16" ]] || [[ "${SEED_SNAP}" == "core18" ]]; then
msg2 "Installing snaps: %s" ${SEED_SNAP}
msg2 "Installing snap: %s" ${SEED_SNAP}
chroot-run $1 snap download --channel=stable "${SEED_SNAP}"
else
msg2 "Installing snaps: %s" ${SEED_SNAP}
msg2 "Installing snap: %s" ${SEED_SNAP}
chroot-run $1 snap download --channel="${SEED_CHANNEL}" "${SEED_SNAP}"
fi
done