Preservation/kaiten-yaki
1
0
Fork 0
mirror of https://github.com/suikan4github/kaiten-yaki.git synced 2025-12-20 02:21:17 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

void installer is now without xterm

Browse source
This commit is contained in:
Suikan 2021-07-01 21:27:12 +09:00
parent 88270a7fed
commit a5ecca9860
2 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
script/config.sh
View file

@ -49,10 +49,3 @@ else
export CRYPTPARTITION=1 export CRYPTPARTITION=1
fi # EFI firmware 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

15
script/void-kaiten-yaki.sh
View file

@ -61,12 +61,8 @@ fi
# ******************************************************************************* # *******************************************************************************
# Install essential packages. # Install essential packages.
# If GUI environment, also install xterm to run the void-installer in a window xbps-install -y -Su xbps gptfdisk
if [ ${GUIENV} -eq 1 ] ; then
xbps-install -y -Su xbps gptfdisk xterm
else
xbps-install -y -Su xbps gptfdisk
fi
# Common part of the pre-install stage # Common part of the pre-install stage
if ! pre_install ; then if ! pre_install ; then
@ -101,11 +97,8 @@ HEREDOC
read dummy_var read dummy_var
# Start void-installer # Start void-installer
if [ $GUIENV -eq 1 ]; then void-installer &
xterm -fa monospace -fs ${XTERMFONTSIZE} -e void-installer &
else
void-installer &
fi
# Record the PID of the installer. # Record the PID of the installer.
installer_pid=$! installer_pid=$!