diff options
Diffstat (limited to 'configs/profile')
| -rwxr-xr-x | configs/profile/build.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index a20824e..d71629c 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -3,8 +3,8 @@ set -e -u # editions -declare -ar VALID_INITS=('openrc' 'systemd') -declare -ar VALID_GUIS=('cli' 'lxde' 'mate') +declare -ar VALID_INITS=( 'openrc' 'systemd' ) +declare -ar VALID_GUIS=( 'cli' 'lxde' 'mate' ) # edition-specific strings iso_title="Parabola GNU/Linux-libre Live" # $iso_edition and $iso_version appended @@ -154,13 +154,15 @@ make_packages() { local _cache_packages="${_cache_base_packages} ${_cache_gui_packages}" _install_packages=${_install_packages// /} _cache_packages=${_cache_packages// /} - [ "${_install_base_packages}" ] && echo "Installing ${_packages_msg}" && echo "${_install_base_lists}" | sed "s/.*\//\t/" - [ "${_cache_base_packages}" ] && echo "Caching ${_packages_msg}" && echo "${_cache_base_lists}" | sed "s/.*\//\t/" - [ "${_install_gui_packages}" ] && echo "Installing ${_gui_packages_msg}" && echo "${_install_gui_lists}" | sed "s/.*\//\t/" - [ "${_cache_gui_packages}" ] && echo "Caching ${_gui_packages_msg}" && echo "${_cache_gui_lists}" | sed "s/.*\//\t/" + [[ -n "${_install_base_packages}" ]] && echo "Installing ${_packages_msg}" && echo "${_install_base_lists}" | sed "s/.*\//\t/" + [[ -n "${_cache_base_packages}" ]] && echo "Caching ${_packages_msg}" && echo "${_cache_base_lists}" | sed "s/.*\//\t/" + [[ -n "${_install_gui_packages}" ]] && echo "Installing ${_gui_packages_msg}" && echo "${_install_gui_lists}" | sed "s/.*\//\t/" + [[ -n "${_cache_gui_packages}" ]] && echo "Caching ${_gui_packages_msg}" && echo "${_cache_gui_lists}" | sed "s/.*\//\t/" # install packages - setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_install_packages}" install + if [[ -n "${_install_packages}" ]]; then + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_install_packages}" install + fi # create live environment local repo or stash package cache if [[ "$enable_offline_install" == 'true' ]]; then |