diff options
author | Iru Cai <mytbk920423@gmail.com> | 2018-10-22 23:23:47 +0800 |
---|---|---|
committer | Iru Cai <mytbk920423@gmail.com> | 2018-10-22 23:47:01 +0800 |
commit | ad74006fb22ddab8d9d8231ba54952543bd0f43e (patch) | |
tree | 4d1b13daf6004d204450db1a82c58f7ecf673e7b | |
parent | b5cebd34e7ed3f4acd85b38d5faa31d8dcdff9c6 (diff) | |
download | liveusb-builder-ad74006fb22ddab8d9d8231ba54952543bd0f43e.tar.xz |
source distroinfo before process_distro
-rwxr-xr-x | buildlive | 4 | ||||
-rw-r--r-- | functions.sh | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -156,6 +156,10 @@ do ISOFILE="${ISOLIST[$i-1]}" ISONAME="${ISONAMELIST[$i-1]}" DISTRO="${DISTROLIST[$i-1]}" + + set_distro "$DISTRO" + export DISTRONAME KEYWORD # for grub and syslinux generation + process_distro "$DISTRO" if [ "$GRUBCFG_ONLY" == 0 ]; then diff --git a/functions.sh b/functions.sh index d888941..158be0b 100644 --- a/functions.sh +++ b/functions.sh @@ -25,12 +25,16 @@ checksum_verify() { fi } +set_distro() { + _distrobase="distro/$(cut -d'/' -f1 <<< "$1")" + source "$_distrobase/distroinfo" +} + # process_isoinfo <iso, e.g. mint/64/xfce> # loads $DISTRONAME $ISONAME $ISOFILE $ISOURL process_isoinfo() { unset MD5 SHA1 SHA256 SHA512 - _distrobase="distro/$(cut -d'/' -f1 <<< "$1")" - source "$_distrobase/distroinfo" + set_distro "$1" source "distro/$1/isoinfo" ISOFILE="$(basename $ISOURL)" } |