From 02d130087921238a0edd14f070a6a874903afef9 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Tue, 25 Jun 2019 00:02:18 -0400
Subject: housekeeping

---
 .../root/customize_root_image-constants.inc        | 27 +++++++++++++++++-----
 .../root-image/root/customize_root_image.sh        |  5 ++--
 2 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'configs/profile/root-image/root')

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 8d2902c..d24b3ed 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/root/customize_root_image-constants.inc
@@ -6,7 +6,7 @@
 #   HAS_BRLTTY_TTS
 
 
-readonly NONSYSTEMD_REGEX='N ; s|^#\[nonsystemd\].*#Include|\[nonsystemd\]\nInclude|'
+/* timezone and locales */
 
 readonly LOCALES="en_US\.UTF-8 \
                   eo           \
@@ -17,6 +17,14 @@ readonly LOCALES="en_US\.UTF-8 \
                   pt_BR\.UTF-8 \
                   pl_PL\.UTF-8 "
 
+
+/* pacman */
+
+readonly NONSYSTEMD_REGEX='N ; s|^#\[nonsystemd\].*#Include|\[nonsystemd\]\nInclude|'
+
+
+/* services */
+
 readonly OPENRC_DELETE_FILES="/etc/hostname                                           \
                               /etc/systemd/scripts/choose-mirror                      \
                               /etc/systemd/system/choose-mirror.service               \
@@ -47,6 +55,9 @@ readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL}
                            $([[ "${ISO_GUI}" != 'cli' ]] && echo " ${SYSTEMD_SERVICES_GUI}")          \
                            $([[ "${ENABLE_TTS_BRLTTY}" == 'yes' ]] && echo " ${SYSTEMD_SERVICES_ACC}")"
 
+
+/* system defaults and root user */
+
 readonly DEFAULT_SHELL=/bin/bash
 
 readonly NETINSTALL_MSG="To install Parabola, the system must be connected to the internet."
@@ -69,11 +80,15 @@ readonly DEFAULT_USER_GROUPS="adm,audio,floppy,log,network,rfkill,scanner,storag
 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 OS_PRETTY_NAME="$(echo ${ISO_TITLE}      | cut -d ' ' -f -5) - (${INSTALL_TYPE})"
-readonly OS_VERSION=$(     echo ${ISO_TITLE}      | cut -d ' ' -f  6                    )
-readonly OS_VERSION_ID=$(  echo ${ISO_TITLE}      | cut -d ' ' -f  6                    )
-readonly OS_VARIANT="$(    echo ${OS_PRETTY_NAME} | cut -d ' ' -f -3 --complement       )"
-readonly OS_VARIANT_ID=${ISO_INIT}-${ISO_GUI}
+
+readonly TITLE_REGEX="^(.+) - (.+) (.+)"
+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 OS_VERSION_ID="$(tr '.' '-' <<<${OS_VERSION})"
+readonly OS_VARIANT="${BASH_REMATCH[  2]} - (${INSTALL_TYPE})"
+readonly OS_VARIANT_ID="${ISO_INIT}-${ISO_GUI}-${INSTALL_TYPE,,}"
 
 
 LOG_CONFIG() { printf "\033[01;34mconfiguring: %s\033[00m\n" "$(echo -e $*)" ; }
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index c4b59eb..5496535 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -21,7 +21,6 @@ chmod 440 /etc/sudoers.d/g_wheel
 
 LOG_CONFIG "pacman"
 
-sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist
 [[ "${ISO_INIT}"     == 'openrc'   ]] && sed -i "$NONSYSTEMD_REGEX"  /etc/pacman-online.conf
 [[ "${INSTALL_TYPE}" == 'Complete' ]] && cp /etc/pacman-offline.conf /etc/pacman.conf || \
                                          cp /etc/pacman-online.conf  /etc/pacman.conf
@@ -55,8 +54,6 @@ fi
 LOG_CONFIG "system defaults and root user"
 
 usermod -s ${DEFAULT_SHELL} root 2> /dev/null
-sed -i "s|_EDITION_TITLE_|${ISO_TITLE}|"                     /etc/motd
-sed -i "s|_NETWORK_MOTD_MSG_|${NETWORK_MOTD_MSG}|"           /etc/motd
 sed -i "s|PRETTY_NAME=.*|PRETTY_NAME=\"${OS_PRETTY_NAME}\"|" /usr/lib/os-release
 echo "VERSION=\"${OS_VERSION}\""                          >> /usr/lib/os-release
 echo "VERSION_ID=\"${OS_VERSION_ID}\""                    >> /usr/lib/os-release
@@ -66,6 +63,8 @@ echo "VARIANT_ID=\"${OS_VARIANT_ID}\""                    >> /usr/lib/os-release
 
 LOG_CONFIG "login session and live user"
 
+sed -i "s|_EDITION_TITLE_|${ISO_TITLE}|"             /etc/motd
+sed -i "s|_NETWORK_MOTD_MSG_|${NETWORK_MOTD_MSG}|"   /etc/motd
 sed -i "s|_ENABLE_TTS_BRLTTY_|${ENABLE_TTS_BRLTTY}|" /etc/skel/.bash_profile
 
 if   [[ "${ISO_GUI}" == 'cli' ]]
-- 
cgit v1.2.2