diff options
Diffstat (limited to 'configs/profile/build.sh')
| -rwxr-xr-x | configs/profile/build.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index 08d8901..35592bb 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -137,15 +137,18 @@ make_packages() { # create live environment local repo or stash package cache if [[ "$enable_offline_install" == 'true' ]]; then if [[ -n ${_cache_packages} ]]; then - # cache packages + # download cache packages setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_cache_packages}" -O install fi - pushd ${work_dir}/${arch}/root-image/isorepo > /dev/null - setarch ${arch} repo-add --new isorepo.db.tar.gz ./* - popd > /dev/null else + # stash package cache for next build mv ${work_dir}/${arch}/root-image/isorepo ${work_dir}/../isorepo-${arch} + mkdir ${work_dir}/${arch}/root-image/isorepo fi + # create 'isorepo' + pushd ${work_dir}/${arch}/root-image/isorepo > /dev/null + setarch ${arch} repo-add --new isorepo.db.tar.gz ./* + popd > /dev/null } # Copy mkinitcpio parabolaiso hooks and build initramfs (root-image) @@ -361,14 +364,14 @@ case "${target}" in ;; esac if [[ "$enable_offline_install" == 'true' ]]; then - iso_arch="${iso_arch}-complete" + iso_type='complete' launch_msg="${launch_msg} (net-install or offline install)" else - iso_arch="${iso_arch}-netinstall" + iso_type='netinstall' launch_msg="${launch_msg} (net-install only)" fi iso_title="${iso_title} ${iso_edition} Edition ${iso_version}" -iso_filename="parabola-${iso_edition}-${iso_arch}-${iso_version}.iso" +iso_filename="parabola-${iso_edition}-${iso_arch}-${iso_type}-${iso_version}.iso" iso_filename=$(echo ${iso_filename} | tr '[:upper:]/' '[:lower:]-') iso_init=$(echo ${iso_edition} | cut -d '/' -f 1 | tr '[:upper:]' '[:lower:]') iso_gui=$( echo ${iso_edition} | cut -d '/' -f 2 | tr '[:upper:]' '[:lower:]') |