diff options
Diffstat (limited to 'configs/profile/build.sh')
| -rwxr-xr-x | configs/profile/build.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index a20824e..9e5960e 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -19,8 +19,8 @@ iso_dirname='parabola' enable_offline_install='false' enable_tts_brltty='false' offline_switch='' -work_dir=./work -out_dir=./out/$(echo "${iso_edition}-${iso_version}" | tr '[:upper:]/' '[:lower:]-') +work_dir=./work/ +out_dir=./out/ target='' verbose='' efi_img_kbytes=40000 @@ -149,6 +149,7 @@ make_packages() { _cache_base_packages=${_cache_base_packages// /} _install_gui_packages=${_install_gui_packages// /} _cache_gui_packages=${_cache_gui_packages// /} + # display results local _install_packages="${_install_base_packages} ${_install_gui_packages}" local _cache_packages="${_cache_base_packages} ${_cache_gui_packages}" @@ -346,7 +347,7 @@ make_aitab() { # Build all filesystem images specified in aitab (.fs.sfs .sfs) make_prepare() { cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir} - setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} pkglist + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} pkglist setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} ${offline_switch} prepare rm -rf ${work_dir}/root-image @@ -404,10 +405,10 @@ else fi iso_title="${iso_title} - ${iso_edition} Edition ${iso_version}" iso_filename="parabola-${iso_edition}-${iso_arch}-${iso_type}-${iso_version}.iso" -iso_filename=$( echo ${iso_filename} | tr '[:upper:]/' '[:lower:]-') -out_dir=./out/$(echo ${iso_edition}-${iso_version} | 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:]' ) +iso_filename=$( echo ${iso_filename} | tr '[:upper:]/' '[:lower:]-') +out_dir=${out_dir}$(echo ${iso_edition}-${iso_version} | 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:]' ) [[ "${iso_init}" == 'openrc' ]] && base_group='base-openrc' || base_group='base' [[ "${archs}" == 'i686' ]] && arch='i686' || arch='x86_64' |