diff --git a/main.sh b/main.sh index aa147a9..7db3e5e 100644 --- a/main.sh +++ b/main.sh @@ -156,11 +156,13 @@ do_partition() { } user() { + header "Username" input "Username" "voiduser" USERNAME=$output } hostname() { + header "Hostname" input "Hostname" "voidlinux" HOSTNAME=$output } @@ -176,6 +178,7 @@ gfx() { gfx+=("$(basename $i)") done if [ "${#gfx[@]}" -gt "1" ]; then + header "GFX" multiplechoice "${gfx[@]}" GFX=$output elif [ "${#gfx[@]}" -eq "1" ]; then @@ -194,6 +197,7 @@ soundsystem() { soundsystem+=("$(basename $i)") done if [ "${#soundsystem[@]}" -gt "1" ]; then + header "Soundsystem" multiplechoice "${soundsystem[@]}" SOUNDSYSTEM=$output elif [ "${#soundsystem[@]}" -eq "1" ]; then @@ -212,6 +216,7 @@ xserver() { xserver+=("$(basename $i)") done if [ "${#xserver[@]}" -gt "1" ]; then + header "Windowsystem" multiplechoice "${xserver[@]}" XSERVER=$output elif [ "${#xserver[@]}" -eq "1" ]; then @@ -230,6 +235,7 @@ profile() { profile+=("$(basename $i)") done if [ "${#profile[@]}" -gt "1" ]; then + header "Select your Profile" multiplechoice "${profile[@]}" PROFILE=$output elif [ "${#profile[@]}" -eq "1" ]; then @@ -257,6 +263,7 @@ printing() { printing+=("$(basename $i)") done if [ "${#printing[@]}" -ge "1" ]; then + header "Printing" if yesno "Do you want printing?" "n"; then if [ "${#printing[@]}" -gt "1" ]; then multiplechoice "${printing[@]}" @@ -278,6 +285,7 @@ printing() { } lang() { + header "Sprache" multiplechoice "de" "en" LANGUAGE=$output if [ "$LANGUAGE" == "de" ]; then @@ -290,6 +298,7 @@ bootloader() { bootloader+=("$(basename $i)") done if [ "${#bootloader[@]}" -gt "1" ]; then + header "Bootloader" multiplechoice "${bootloader[@]}" BOOTLOADER=$output elif [ "${#bootloader[@]}" -eq "1" ]; then @@ -309,6 +318,7 @@ network() { network+=("$(basename $i)") done if [ "${#network[@]}" -gt "1" ]; then + header "Networkmanager" multiplechoice "${network[@]}" NETWORK=$output elif [ "${#network[@]}" -eq "1" ]; then @@ -323,12 +333,14 @@ network() { } do_install() { + header "Installation" mkdir -p ${target}/var/db/xbps/keys cp /var/db/xbps/keys/* ${target}/var/db/xbps/keys xbps-install -Sy -R https://alpha.de.repo.voidlinux.org/current -r $target "${pkgs[@]}" } do_chroot() { + header "Chroot into new System" mkdir -p ${target}/tmp/vinstaller/ mount -t tmpfs -o size=50m tmpfs ${target}/tmp/vinstaller/ @@ -369,8 +381,7 @@ chroot ${target} /tmp/vinstaller/main_chroot } ready() { - echo ""; echo "" - echo "#################" + header "Ready!!" echo "" echo "login: ${USERNAME}:${pass}" echo "hostname: $HOSTNAME"