diff options
Diffstat (limited to 'configs/profile/root-image/root/customize_root_image-constants.inc')
| -rw-r--r-- | configs/profile/root-image/root/customize_root_image-constants.inc | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/configs/profile/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc index a3c992e..69d60a7 100644 --- a/configs/profile/root-image/root/customize_root_image-constants.inc +++ b/configs/profile/root-image/root/customize_root_image-constants.inc @@ -1,7 +1,8 @@ # environment vars from build.sh: # ISO_TITLE # ISO_INIT -# ISO_GUI +# ISO_WMDE +# ISO_ARCH # ENABLE_OFFLINE_INSTALL # ENABLE_TTS_BRLTTY @@ -50,10 +51,10 @@ readonly SYSTEMD_SERVICES_ACC="bluetooth.service \ livecd-alsa-unmuter.service " readonly SYSTEMD_SERVICES_GUI="NetworkManager.service" readonly OPENRC_SERVICES="${OPENRC_SERVICES_ALL} \ - $([[ "${ISO_GUI}" != 'cli' ]] && echo " ${OPENRC_SERVICES_GUI}")" -readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL} \ - $([[ "${ISO_GUI}" != 'cli' ]] && echo " ${SYSTEMD_SERVICES_GUI}") \ - $([[ "${ENABLE_TTS_BRLTTY}" == 'yes' ]] && echo " ${SYSTEMD_SERVICES_ACC}")" + $([[ "${ISO_WMDE}" != 'cli' ]] && echo " ${OPENRC_SERVICES_GUI}")" +readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL} \ + $([[ "${ISO_WMDE}" != 'cli' ]] && echo " ${SYSTEMD_SERVICES_GUI}") \ + $([[ "${ENABLE_TTS_BRLTTY}" == 'yes' ]] && echo " ${SYSTEMD_SERVICES_ACC}") " ## system defaults and root user ## @@ -81,14 +82,18 @@ readonly OPENRC_USER_GROUPS="disk,sys" [[ "${ISO_INIT}" == 'openrc' ]] && readonly LIVE_USER_GROUPS="${DEFAULT_USER_GROUPS},${OPENRC_USER_GROUPS}" || readonly LIVE_USER_GROUPS="${DEFAULT_USER_GROUPS}" -readonly TITLE_REGEX="^(.+) - (.+) (.+)$" +readonly TITLE_REGEX="^(.+) - (.+ Edition) (.+)$" readonly TITLE_ERROR_MSG="malformed ISO title:\n\t'${ISO_TITLE}'" ! [[ "${ISO_TITLE}" =~ ${TITLE_REGEX} ]] && echo -e "${TITLE_ERROR_MSG}" && exit 1 -readonly OS_PRETTY_NAME="${BASH_REMATCH[ 1]}" -readonly OS_VERSION="${BASH_REMATCH[ 3]}" +readonly PRETTY_NAME="${BASH_REMATCH[ 1]}" +readonly EDITION="${BASH_REMATCH[ 2]}" +readonly VERSION=${BASH_REMATCH[ 3]} +readonly RELEASE_ID=${ISO_ARCH}-${ISO_INIT}-${ISO_WMDE} +readonly OS_PRETTY_NAME="${PRETTY_NAME}" +readonly OS_VERSION=${VERSION} readonly OS_VERSION_ID="$(tr '.' '-' <<<${OS_VERSION})" -readonly OS_VARIANT="${BASH_REMATCH[ 2]} - (${INSTALL_TYPE})" -readonly OS_VARIANT_ID="${ISO_INIT}-${ISO_GUI}-${INSTALL_TYPE,,}" +readonly OS_VARIANT="${ISO_ARCH} ${EDITION} - (${INSTALL_TYPE})" +readonly OS_VARIANT_ID=${RELEASE_ID} LOG_CONFIG() { printf "\033[01;34mconfiguring: %s\033[00m\n" "$(echo -e $*)" ; } |