summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigs/profile/build.sh56
1 files changed, 33 insertions, 23 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 86d4ded..b87d86c 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -19,7 +19,7 @@ iso_dirname='parabola'
enable_offline_install='false'
offline_switch=''
work_dir=./work
-out_dir=./out
+out_dir=./out/$(echo "${iso_edition}-${iso_version}" | tr '[:upper:]/' '[:lower:]-')
target=''
verbose=''
efi_img_kbytes=40000
@@ -94,40 +94,49 @@ make_packages() {
# standard package lists
local _install_base_lists=$( ls ${packages_dir}/packages-{all,${iso_init}}.{all,${arch}} 2> /dev/null || true)
local _cache_base_lists=$( ls ${packages_dir}/cache-{all,${iso_init}}.{all,${arch}} 2> /dev/null || true)
- # gui-specific package lists
- local _install_gui_lists=$( ls ${packages_dir}/packages-{gui,${iso_gui}}.{all,${arch}} 2> /dev/null || true)
- local _cache_gui_lists=$( ls ${packages_dir}/cache-{gui,${iso_gui}}.{all,${arch}} 2> /dev/null || true)
+ # standard gui package lists
+ local _install_basegui_lists=$(ls ${packages_dir}/packages-gui.{all,${arch}} 2> /dev/null || true)
+ local _cache_basegui_lists=$( ls ${packages_dir}/cache-gui.{all,${arch}} 2> /dev/null || true)
# init-specific gui package lists
local _install_initgui_lists=$(ls ${packages_dir}/packages-${iso_init}-gui.{all,${arch}} 2> /dev/null || true)
local _cache_initgui_lists=$( ls ${packages_dir}/cache-${iso_init}-gui.{all,${arch}} 2> /dev/null || true)
+ # wmde-specific package lists
+ local _install_gui_lists=$( ls ${packages_dir}/packages-${iso_gui}.{all,${arch}} 2> /dev/null || true)
+ local _cache_gui_lists=$( ls ${packages_dir}/cache-${iso_gui}.{all,${arch}} 2> /dev/null || true)
_install_base_lists=${_install_base_lists// /}
_cache_base_lists=${_cache_base_lists// /}
- _install_gui_lists=${_install_gui_lists// /}
- _cache_gui_lists=${_cache_gui_lists// /}
+ _install_basegui_lists=${_install_basegui_lists// /}
+ _cache_basegui_lists=${_cache_basegui_lists// /}
_install_initgui_lists=${_install_initgui_lists// /}
_cache_initgui_lists=${_cache_initgui_lists// /}
+ _install_gui_lists=${_install_gui_lists// /}
+ _cache_gui_lists=${_cache_gui_lists// /}
# collect standard packages
local _install_base_packages=$( [ "${_install_base_lists}" ] && grep -hv ^# ${_install_base_lists})
local _cache_base_packages=$( [ "${_cache_base_lists}" ] && grep -hv ^# ${_cache_base_lists})
- # collect gui-specific packages
- local _install_gui_packages=$( [ "${_install_gui_lists}" ] && grep -hv ^# ${_install_gui_lists})
- local _cache_gui_packages=$( [ "${_cache_gui_lists}" ] && grep -hv ^# ${_cache_gui_lists})
+ # collect standard gui packages
+ local _install_basegui_packages=$([ "${_install_basegui_lists}" ] && grep -hv ^# ${_install_basegui_lists})
+ local _cache_basegui_packages=$( [ "${_cache_basegui_lists}" ] && grep -hv ^# ${_cache_basegui_lists})
# collect init-specific gui packages
local _install_initgui_packages=$([ "${_install_initgui_lists}" ] && grep -hv ^# ${_install_initgui_lists})
local _cache_initgui_packages=$( [ "${_cache_initgui_lists}" ] && grep -hv ^# ${_cache_initgui_lists})
+ # collect wmde-specific packages
+ local _install_gui_packages=$( [ "${_install_gui_lists}" ] && grep -hv ^# ${_install_gui_lists})
+ local _cache_gui_packages=$( [ "${_cache_gui_lists}" ] && grep -hv ^# ${_cache_gui_lists})
if [[ "${iso_gui}" != 'cli' ]]; then
_gui_packages_msg="${_gui_packages_msg/non-graphical/graphical}"
- _install_gui_lists="${_install_gui_lists} ${_install_initgui_lists}"
- _cache_gui_lists="${_cache_gui_lists} ${_cache_initgui_lists}"
- _install_gui_packages="${_install_gui_packages} ${_install_initgui_packages}"
- _cache_gui_packages="${_cache_gui_packages} ${_cache_initgui_packages}"
+ _install_gui_lists="${_install_basegui_lists} ${_install_initgui_lists} ${_install_gui_lists}"
+ _cache_gui_lists="${_cache_basegui_lists} ${_cache_initgui_lists} ${_cache_gui_lists}"
+ _install_gui_packages="${_install_basegui_packages} ${_install_initgui_packages} ${_install_gui_packages}"
+ _cache_gui_packages="${_cache_basegui_packages} ${_cache_initgui_packages} ${_cache_gui_packages}"
fi
- # display results
_install_gui_lists=${_install_gui_lists// /}
_cache_gui_lists=${_cache_gui_lists// /}
+ _install_base_packages=${_install_base_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}"
_install_packages=${_install_packages// /}
@@ -374,9 +383,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:]-')
-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/$(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'
@@ -395,20 +405,20 @@ pacman_conf=${pacman_conf// /}
# validate build environment
if [[ "$(uname -m)" != 'x86_64' ]] || ! grep 'ID_LIKE=.*archlinux' /usr/lib/os-release > /dev/null; then
- echo "This script needs to be run on an x86_64 ArchLinux derrivative."
+ LOG_ERROR "This script needs to be run on an x86_64 ArchLinux derrivative."
exit 1
elif [[ ${EUID} -ne 0 ]]; then
- echo "This script needs to be run with root privileges."
+ LOG_ERROR "This script needs to be run with root privileges."
exit 1
elif ! pacman --version | grep libalpm > /dev/null; then
- echo "This script needs the 'pacman' package manager to be installed."
+ LOG_ERROR "This script needs the 'pacman' package manager to be installed."
exit 1
elif ! pacman -Qi parabolaiso-data > /dev/null; then
- echo "This script needs the 'parabolaiso-data' package to be installed."
+ LOG_ERROR "This script needs the 'parabolaiso-data' package to be installed."
exit 1
elif ! echo "${VALID_INITS[@]}" | tr " " "\n" | grep -E "^${iso_init}$" > /dev/null || \
! echo "${VALID_GUIS[@]}" | tr " " "\n" | grep -E "^${iso_gui}$" > /dev/null; then
- echo "Invalid init/wm combination: '${iso_edition}'."
+ LOG_ERROR "Invalid init/wm combination: '${iso_edition}'."
exit 1
fi
@@ -425,7 +435,7 @@ for arch in ${archs}; do
! -f ${prefix}boot_${arch} -o ! -f ${prefix}prepare_${arch} ] && \
is_done=0
done
-if ! (($is_done)); then echo ${launch_msg}; else echo "Nothing to do"; exit; fi;
+if ! (($is_done)); then LOG_STEP ${launch_msg}; else LOG_STEP "Nothing to do"; exit; fi;
## build ISO ##