From a5ecca9860cfa73fc8e662d54522fbd971dd252d Mon Sep 17 00:00:00 2001 From: Suikan <26223147+suikan4github@users.noreply.github.com> Date: Thu, 1 Jul 2021 21:27:12 +0900 Subject: [PATCH] void installer is now without xterm --- script/config.sh | 7 ------- script/void-kaiten-yaki.sh | 15 ++++----------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/script/config.sh b/script/config.sh index 95a849b..85dee04 100644 --- a/script/config.sh +++ b/script/config.sh @@ -49,10 +49,3 @@ else export CRYPTPARTITION=1 fi # EFI firmware -# Void Linux only. Ignored in Ubuntu. -# Detect the GUI environment -if env | grep -w -e XDG_SESSION_TYPE -e DISPLAY -e WAYLAND_DISPLAY > /dev/null ; then - export GUIENV=1 # set 1 if GUI env. -else - export GUIENV=0 # set 0 if not GUI env. -fi \ No newline at end of file diff --git a/script/void-kaiten-yaki.sh b/script/void-kaiten-yaki.sh index f7eac31..5e2ac6b 100644 --- a/script/void-kaiten-yaki.sh +++ b/script/void-kaiten-yaki.sh @@ -61,12 +61,8 @@ fi # ******************************************************************************* # Install essential packages. -# If GUI environment, also install xterm to run the void-installer in a window -if [ ${GUIENV} -eq 1 ] ; then - xbps-install -y -Su xbps gptfdisk xterm -else - xbps-install -y -Su xbps gptfdisk -fi +xbps-install -y -Su xbps gptfdisk + # Common part of the pre-install stage if ! pre_install ; then @@ -101,11 +97,8 @@ HEREDOC read dummy_var # Start void-installer -if [ $GUIENV -eq 1 ]; then - xterm -fa monospace -fs ${XTERMFONTSIZE} -e void-installer & -else - void-installer & -fi +void-installer & + # Record the PID of the installer. installer_pid=$!