From 66ad6fa683aa6b05e4f6fbd1bbbbb799f4b9cd93 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Sun, 16 Feb 2020 00:03:55 -0500
Subject: boot calamares from .xinitrc

---
 configs/profile/root-image/root/.language.sh               | 10 ++++++++++
 .../root-image/root/customize_root_image-constants.inc     |  1 +
 configs/profile/root-image/root/customize_root_image.sh    | 14 ++++++++++++++
 3 files changed, 25 insertions(+)

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

diff --git a/configs/profile/root-image/root/.language.sh b/configs/profile/root-image/root/.language.sh
index f3f6950..bc8e9f5 100755
--- a/configs/profile/root-image/root/.language.sh
+++ b/configs/profile/root-image/root/.language.sh
@@ -11,6 +11,10 @@ readonly LANG_DEFAULT='en_US.UTF-8'
 readonly KEYMAP_TITLE="System keymap selection"
 readonly KEYMAP_PROMPT="Choose your keymap:"
 readonly KEYMAP_DEFAULT='us'
+readonly INTERFACE_TITLE="Launch installer or command-line"
+readonly INTERFACE_PROMPT="Would you like to start the installer, or drop onto the command line?"
+readonly INTERFACE_DEFAULT='calamares'
+readonly INTERFACES=( 'calamares' 'wizard' 'cli' )
 
 readonly -a LANGUAGES=( 'en_US.UTF-8' "English"    \
                         'eo'          "Esperanto"  \
@@ -196,4 +200,10 @@ then keymap=$(Prompt "$KEYMAP_TITLE" "$KEYMAP_PROMPT" $KEYMAP_DEFAULT "${KEYMAPS
      sed -i "s/^XKBMAP=.*/XKBMAP=${keymap}/" /root/.codecheck
 fi
 
+
+## prompt to launch installer or CLI ##
+
+interface=$(Prompt "$INTERFACE_TITLE" "$INTERFACE_PROMPT" $INTERFACE_DEFAULT "${INTERFACES[@]}")
+[ "${interface}" == "" ] && interface=$INTERFACE_DEFAULT
+
 clear
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 69d60a7..7c0a98e 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/root/customize_root_image-constants.inc
@@ -75,6 +75,7 @@ readonly ROOT_SKEL_FILES="/etc/skel/.bash_logout           \
                           /etc/skel/.bash_profile          \
                           /etc/skel/install-openrc-lxde.sh \
                           /etc/skel/install-systemd-mate.sh"
+readonly MINI_SKEL_FILES="/etc/skel/.xinitrc"
 
 readonly LIVE_USER=parabola
 readonly DEFAULT_USER_GROUPS="adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel"
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 92e4617..7dc98ef 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -72,6 +72,20 @@ case "${ISO_WMDE}" in
   sed -i "s|_DESKTOP_SESSION_||" /root/.bash_profile
   ;;
 
+'mini' ) # configure installer-only session
+  cp ${ROOT_SKEL_FILES} /root/
+  cp ${MINI_SKEL_FILES} /root/
+#   sed -i "s|_DESKTOP_SESSION_|mini|" /root/.bash_profile
+sed -i "s|_DESKTOP_SESSION_||" /root/.bash_profile
+  cat > /root/.gtkrc-2.0 << END
+gtk-theme-name="parabola-blackmate"
+gtk-icon-theme-name="Adwaita"
+gtk-font-name="Sans 10"
+gtk-cursor-theme-name="FlatbedCursors-Blue"
+gtk-cursor-theme-size=18
+END
+  ;;
+
 * ) # configure GUI login session
 
   # configure live user
-- 
cgit v1.2.2