Merge pull request #2 from crystal-linux/development

seems to work :shipit:

PKGBUILD

@@ -0,0 +1,18 @@
+# Maintainer: echo -n 'bWF0dEBnZXRjcnlzdC5hbA==' | base64 --decode
+
+pkgname=jade_tui
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="TUI for installing the system with jade"
+license=('GPL3')
+arch=('any')
+url="https://github.com/crystal-linux/jade-tui"
+source=("jade-tui" "locales")
+depends=('jade' 'gum' 'openssl')
+md5sums=('f8bfed0ea3f1b5e85138b0c8b4770e48'
+         'cba37f460dcf5f678043df39d6378c35')
+
+package() {
+    install -D -m 755 jade-tui ${pkgdir}/usr/bin/.
+    install -D -m 700 locales ${pkgdir}/usr/share/jade-tui/.
+}

jade-tui

@@ -1,7 +1,20 @@
 #!/usr/bin/bash
 
-# Welcome screen
+version="2.0.0 beta"
-gum confirm "$(gum style --border normal --margin '1' --padding '1 2' --border-foreground 212 "$(gum style --foreground 212 '                        mysssym
+
+main_color="#A900FF"
+warning_color="#ff0000"
+
+export BORDER_FOREGROUND="$main_color"
+export GUM_CONFIRM_SELECTED_BACKGROUND="$main_color"
+export GUM_CHOOSE_CURSOR_FOREGROUND="$main_color"
+export GUM_CHOOSE_SELECTED_FOREGROUND="$main_color"
+export GUM_INPUT_CURSOR_FOREGROUND="$main_color"
+export GUM_FILTER_INDICATOR_FOREGROUND="$main_color"
+export FOREGROUND="#ffffff"
+
+Welcome() {
+    gum confirm "$(gum style --border normal --margin '1' --padding '1 2' "$(gum style --foreground "$main_color" '                        mysssym
                       mysssym
                     mysssym
                   mysssym
@@ -20,35 +33,44 @@ gum confirm "$(gum style --border normal --margin '1' --padding '1 2' --border-f
                dysssym
              dysssym
            dysssym
-         dysssym')" "" "Welcome to jade-tui" "Ready to make your Crystal installation... ready?")" && CONTINUE=true
+         dysssym')" "" "Welcome to jade-tui" "Ready to make your Crystal installation... ready?" "$(gum style --foreground "#2B2B2B" "jade-tui version: $version")")" && CONTINUE=true
     if [[ $CONTINUE != "true" ]]; then
         echo "Exiting. Have a good day!"
         exit
     fi
+}
 
-# Select timezone, keymap, locale
+Timezone() {
     timezone=$(timedatectl list-timezones | gum filter --placeholder "select a timezone")
+}
+
+Keymap() {
     keymap=$(localectl list-keymaps | gum filter --placeholder "select a keymap")
+}
+
+Locale() {
     locale=$(cat /usr/share/jade-tui/locales | gum filter --placeholder "select a locale")
+}
 
-# Username
+Username() {
     clear
-gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Please enter your username"
+    gum style --border normal --margin "1" --padding "1 2" "Please enter your username"
     username=$(gum input --placeholder "Please enter your username")
+}
 
-# User password
+Password() {
     matches="false"
     passwrong="false"
     while [[ "$matches" == "false" ]]; do
         clear
         if [[ "$passwrong" == "true" ]]; then
-		gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Passwords did not match, please type the password again"
+            gum style --border normal --margin "1" --padding "1 2" "Passwords did not match, please type the password again"
         else
-		gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Now enter your password"
+            gum style --border normal --margin "1" --padding "1 2" "Now enter your password"
         fi
         password=$(gum input --password --placeholder "Please enter a password")
         clear
-	gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Verify your password"
+        gum style --border normal --margin "1" --padding "1 2" "Verify your password"
         password_verif=$(gum input --password --placeholder "Type your password again")
         if [[ "$password" == "$password_verif" ]]; then
             matches="true"
@@ -57,11 +79,12 @@ while [[ "$matches" == "false" ]]; do
         fi
     done
     crypt_password=$(openssl passwd -crypt $password)
+}
 
-# Root password
+RootPassword() {
     clear
     different_root_password=true
-gum confirm "$(gum style --border normal --margin '1' --padding '1 2' --border-foreground 212 'Use same password for root?')" && different_root_password=false
+    gum confirm "$(gum style --border normal --margin '1' --padding '1 2' 'Use same password for root?')" && different_root_password=false
     if [[ $different_root_password != "true" ]]; then
         root_password=$password # set root password same as user password
     else
@@ -70,13 +93,13 @@ else
         while [[ "$root_matches" == "false" ]]; do
             clear
             if [[ "$root_passwrong" == "true" ]]; then
-			gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Passwords did not match, please type the root password again"
+                gum style --border normal --margin "1" --padding "1 2" "Passwords did not match, please type the root password again"
             else
-			gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Now enter your root password"
+                gum style --border normal --margin "1" --padding "1 2" "Now enter your root password"
             fi
             root_password=$(gum input --password --placeholder "Please enter a root password")
             clear
-		gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Verify your root password"
+            gum style --border normal --margin "1" --padding "1 2" "Verify your root password"
             root_password_verif=$(gum input --password --placeholder "Type your root password again")
             if [[ "$root_password" == "$root_password_verif" ]]; then
                 root_matches="true"
@@ -86,36 +109,104 @@ else
         done
     fi
     crypt_root_password=$(openssl passwd -crypt ${root_password})
+}
 
-# Default shell
+Shell() {
     clear
-gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Select a default shell"
+    gum style --border normal --margin "1" --padding "1 2" "Select a default shell"
     shell=$(gum choose --limit 1 fish zsh bash)
+
+    # TODO: remove when jade works all the time
     if [[ "$shell" == "fish" ]]; then
         fish_pkg="\"fish\""
     else
         fish_pkg=""
     fi
+}
 
-# Hostname
+Hostname() {
     clear
-gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Please enter a hostname"
+    gum style --border normal --margin "1" --padding "1 2" "Please enter a hostname"
     hostname=$(gum input --placeholder "Please enter a hostname")
+}
 
-# Select disk
+AutoDisk() {
     clear
-gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Please select the disk to install to" "$(gum style --foreground 212 'WARNING: This will erease the whole disk')"
+    gum style --border normal --margin "1" --padding "1 2" "Please select the disk to install to" "$(gum style --foreground "$warning_color" 'WARNING: This will erease the whole disk')"
     disk_dev=$(lsblk -pdo name | grep -v zram | grep -v NAME | grep -v loop | grep -v sr | gum choose --limit 1)
     disk=$(echo $disk_dev | awk '{ print substr ($0, 6 ) }')
+}
+
+UEFICheck() {
+    is_uefi=$([ -d /sys/firmware/efi ] && echo true || echo false)
+    if [[ $is_uefi == "true" ]]; then
+        grub_type="grub-efi"
+        grub_location="/boot/efi"
+    else
+        grub_type="grub-legacy"
+        grub_location="$disk_dev"
+    fi
+}
+
+ManualDisk() {
+    testing="true"
+    # TODO: Add manual disk partitioning support
+    # 1. Check if UEFI or BIOS
+    if [[ $is_uefi == "true" || $testing == "true" ]]; then
+        # 2. Show what the user has to create like in arch wiki
+        gum style --border normal --margin "1" --padding "1 2" "Example partition layout:"
+        gum style --border normal --foreground $warning_color "Note: swap partition needs to be enabled after install"
+        echo ""
+        echo ""
+
+        EFI_PART=$(gum style --border normal "EFI system partition")
+        EFI_SIZE=$(gum style --border normal "At least 300 MiB")
+        SWAP_PART=$(gum style --border normal "Linux swap")
+        SWAP_SIZE=$(gum style --border normal "More than 512 MiB")
+        ROOT_PART=$(gum style --border normal "Linux x86-64 root")
+        ROOT_SIZE=$(gum style --border normal "Remainder of the device")
+        EFI_ROW=$(gum join "$EFI_PART" "$EFI_SIZE")
+        SWAP_ROW=$(gum join "$SWAP_PART" "$SWAP_SIZE")
+        ROOT_ROW=$(gum join "$ROOT_PART" "$ROOT_SIZE")
+
+        gum join --vertical "$EFI_ROW" "$SWAP_ROW" "$ROOT_ROW"
 
-# Select desktop
+        # 3. Open cfdisk
+        gum style --border normal --margin "1" --padding "1 2" "Please select the disk to partition" "$(gum style --foreground "$warning_color" 'WARNING: This will erease the whole disk')"
+        disk_dev=$(lsblk -pdo name | grep -v zram | grep -v NAME | grep -v loop | grep -v sr | gum choose --limit 1)
+        clear
+        gum style --border normal --margin "1" --padding "1 2" "Password: crystal"
+        sudo cfdisk $disk_dev
+
+        # 4. Ask what partition is what
+        clear
+        gum style --border normal --margin "1" --padding "1 2" "Select EFI partition"
+        efi_part=$(lsblk | grep -v zram | grep -v NAME | grep -v loop | grep -v sr | gum choose --limit 1)
         clear
-gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Select a desktop to use"
+        gum style --border normal --margin "1" --padding "1 2" "Select EFI partition mountpoint"
+        efi_part_mount=$(gum choose --limit 1 "none" "/" "/boot" "/boot/efi" "/home" "/opt" "/tmp" "/usr" "var")
+        clear
+        gum style --border normal --margin "1" --padding "1 2" "Select root partition"
+        root_part=$(lsblk | grep -v zram | grep -v NAME | grep -v loop | grep -v sr | gum choose --limit 1)
+        clear
+        gum style --border normal --margin "1" --padding "1 2" "Select root partition mountpoint"
+        root_part_mount=$(gum choose --limit 1 "none" "/" "/boot" "/boot/efi" "/home" "/opt" "/tmp" "/usr" "var")
+
+        # TODO: remove junk from efi_part, root_part
+    else
+        echo Manual BIOS partitioning is not supported yet
+    fi
+}
+
+Desktop() {
+    clear
+    gum style --border normal --margin "1" --padding "1 2" "Select a desktop to use"
     desktop=$(gum choose --limit 1 gnome kde budgie mate cinnamon lxqt sway i3gaps herbstluftwm awesome bspwm)
+}
 
-# misc settings
+Misc() {
     clear
-gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "Some miscellaneous settings" "Use space to enable/disable"
+    gum style --border normal --margin "1" --padding "1 2" "Some miscellaneous settings" "Use space to enable/disable"
     misc_settings=$(gum choose --limit 4 "Enable ipv6" "Enable timeshift" "Enable zramd" "Enable flatpak")
     enable_ipv6="false"
     enable_timeshift="false"
@@ -133,24 +224,15 @@ fi
     if [[ $misc_settings == *"flatpak"* ]]; then
         enable_flatpak="true"
     fi
+}
 
-# Check if system is uefi
-is_uefi=$([ -d /sys/firmware/efi ] && echo true || echo false)
-if [[ $is_uefi == "true" ]]; then
- 	grub_type="grub-efi"
-	grub_location="/boot/efi"
-else
-	grub_type="grub-legacy"
-	grub_location="$disk_dev"
-fi
 
-# Summary
+Summary() {
     clear
     CONTINUE=false
-gum confirm "$(gum style --border normal --margin '1' --padding '1 2' --border-foreground 212 "Summary, is this correct?" "" "keymap: $keymap" "timezone: $timezone" "locale: $locale" "username: $username" "password: $password" "Default shell: $shell" "root-password: $root_password" "hostname: $hostname" "disk: $disk" "desktop: $desktop" "ipv6: $enable_ipv6" "timeshift: $enable_timeshift" "enable zramd: $enable_zramd" "enable flatpak: $enable_flatpak" "efi: $is_uefi")" && CONTINUE=true
+    gum confirm "$(gum style --border normal --margin '1' --padding '1 2' "Summary, is this correct?" "" "keymap: $keymap" "timezone: $timezone" "locale: $locale" "username: $username" "password: $password" "Default shell: $shell" "root-password: $root_password" "hostname: $hostname" "disk: $disk" "desktop: $desktop" "ipv6: $enable_ipv6" "timeshift: $enable_timeshift" "enable zramd: $enable_zramd" "enable flatpak: $enable_flatpak" "efi: $is_uefi")" && CONTINUE=true
     if [[ $CONTINUE != "true" ]]; then
-	echo "Exiting. Have a good day!"
+        Change
-	exit
     else
         # Remove config.json if it exists
         if [[ $(ls | grep "/tmp/config.json") ]]; then
@@ -205,13 +287,38 @@ else
         \"kernel\": \"linux\"
     }" > /tmp/config.json
     fi
+}
 
-# Ask to install
+Change() {
+    gum style --border normal --margin '1' --padding '1 2' "What do you want to change?"
+    $(gum choose --limit 1 Timezone Keymap Locale Username Password RootPassword Shell Hostname AutoDisk Desktop Misc)
+    Summary
+}
+
+Install() {
     CONTINUE=false
-gum confirm "$(gum style --border normal --margin '1' --padding '1 2' --border-foreground 212 "Are you sure you want to install?" "$(gum style --foreground 212 'WARNING: This will erease the whole disk')")" && CONTINUE=true
+    gum confirm "$(gum style --border normal --margin '1' --padding '1 2' "Are you sure you want to install?" "$(gum style --foreground "$warning_color" 'WARNING: This will erease the whole disk')")" && CONTINUE=true
     if [[ $CONTINUE != "true" ]]; then
         echo "Exiting. Have a good day!"
         exit
     else
         sudo jade config /tmp/config.json
     fi
+}
+
+Welcome
+Timezone
+Keymap
+Locale
+Username
+Password
+RootPassword
+Shell
+Hostname
+AutoDisk # TODO: Add manual partitioning support
+# ManualDisk
+Desktop
+Misc
+UEFICheck
+Summary
+Install