mirror of
https://github.com/ChrisTitusTech/linutil.git
synced 2024-11-22 13:22:28 +00:00
archtitus fixes
This commit is contained in:
Chris Titus
parent
b9971d0fbc
commit
6eedd7d3c2
|
|
@ -79,113 +79,50 @@ background_checks() {
|
||||||
# "opt1" "opt2" ...
|
# "opt1" "opt2" ...
|
||||||
# Return value: selected index (0 for opt1, 1 for opt2 ...)
|
# Return value: selected index (0 for opt1, 1 for opt2 ...)
|
||||||
select_option() {
|
select_option() {
|
||||||
|
local options=("$@")
|
||||||
|
local num_options=${#options[@]}
|
||||||
|
local selected=0
|
||||||
|
|
||||||
# little helpers for terminal print control and key input
|
|
||||||
ESC=$( printf "\033")
|
|
||||||
cursor_blink_on() { printf "${ESC}[?25h"; }
|
|
||||||
cursor_blink_off() { printf "${ESC}[?25l"; }
|
|
||||||
cursor_to() { printf "${ESC}[$1;${2:-1}H"; }
|
|
||||||
print_option() { printf "$2 $1 "; }
|
|
||||||
print_selected() { printf "$2 ${ESC}[7m $1 ${ESC}[27m"; }
|
|
||||||
get_cursor_row() { IFS=';' read -sdR -p $'\E[6n' ROW COL; echo ${ROW#*[}; }
|
|
||||||
get_cursor_col() { IFS=';' read -sdR -p $'\E[6n' ROW COL; echo ${COL#*[}; }
|
|
||||||
key_input() {
|
|
||||||
local key
|
|
||||||
IFS= read -rsn1 key 2>/dev/null >&2
|
|
||||||
if [[ $key = "" ]]; then echo enter; fi;
|
|
||||||
if [[ $key = $'\x20' ]]; then echo space; fi;
|
|
||||||
if [[ $key = "k" ]]; then echo up; fi;
|
|
||||||
if [[ $key = "j" ]]; then echo down; fi;
|
|
||||||
if [[ $key = "h" ]]; then echo left; fi;
|
|
||||||
if [[ $key = "l" ]]; then echo right; fi;
|
|
||||||
if [[ $key = "a" ]]; then echo all; fi;
|
|
||||||
if [[ $key = "n" ]]; then echo none; fi;
|
|
||||||
if [[ $key = $'\x1b' ]]; then
|
|
||||||
read -rsn2 key
|
|
||||||
if [[ $key = [A || $key = k ]]; then echo up; fi;
|
|
||||||
if [[ $key = [B || $key = j ]]; then echo down; fi;
|
|
||||||
if [[ $key = [C || $key = l ]]; then echo right; fi;
|
|
||||||
if [[ $key = [D || $key = h ]]; then echo left; fi;
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
print_options_multicol() {
|
|
||||||
# print options by overwriting the last lines
|
|
||||||
local curr_col=$1
|
|
||||||
local curr_row=$2
|
|
||||||
local curr_idx=0
|
|
||||||
|
|
||||||
local idx=0
|
|
||||||
local row=0
|
|
||||||
local col=0
|
|
||||||
|
|
||||||
curr_idx=$(( $curr_col + $curr_row * $colmax ))
|
|
||||||
|
|
||||||
for option in "${options[@]}"; do
|
|
||||||
|
|
||||||
row=$(( $idx/$colmax ))
|
|
||||||
col=$(( $idx - $row * $colmax ))
|
|
||||||
|
|
||||||
cursor_to $(( $startrow + $row + 1)) $(( $offset * $col + 1))
|
|
||||||
if [ $idx -eq $curr_idx ]; then
|
|
||||||
print_selected "$option"
|
|
||||||
else
|
|
||||||
print_option "$option"
|
|
||||||
fi
|
|
||||||
((idx++))
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
# initially print empty new lines (scroll down if at bottom of screen)
|
|
||||||
for opt; do printf "\n"; done
|
|
||||||
|
|
||||||
# determine current screen position for overwriting the options
|
|
||||||
local lastrow=$(get_cursor_row)
|
|
||||||
local startrow=$(($lastrow - $#))
|
|
||||||
local cols=$(tput cols)
|
|
||||||
|
|
||||||
# Calculate the maximum number of columns based on screen width and option length
|
|
||||||
local max_option_length=0
|
|
||||||
for opt in "$@"; do
|
|
||||||
if [ ${#opt} -gt $max_option_length ]; then
|
|
||||||
max_option_length=${#opt}
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
local colmax=$(( $cols / (max_option_length + 4) ))
|
|
||||||
if [ $colmax -lt 1 ]; then colmax=1; fi
|
|
||||||
|
|
||||||
local offset=$(( $cols / $colmax ))
|
|
||||||
|
|
||||||
shift 4
|
|
||||||
|
|
||||||
# ensure cursor and input echoing back on upon a ctrl+c during read -s
|
|
||||||
trap "cursor_blink_on; stty echo; printf '\n'; exit" 2
|
|
||||||
cursor_blink_off
|
|
||||||
|
|
||||||
local active_row=0
|
|
||||||
local active_col=0
|
|
||||||
while true; do
|
while true; do
|
||||||
print_options_multicol $active_col $active_row
|
clear
|
||||||
# user key control
|
echo "Please select an option using the arrow keys and Enter:"
|
||||||
case `key_input` in
|
for i in "${!options[@]}"; do
|
||||||
enter) break;;
|
if [ $i -eq $selected ]; then
|
||||||
up) ((active_row--));
|
echo "> ${options[$i]}"
|
||||||
if [ $active_row -lt 0 ]; then active_row=0; fi;;
|
else
|
||||||
down) ((active_row++));
|
echo " ${options[$i]}"
|
||||||
if [ $active_row -ge $(( ${#options[@]} / $colmax )) ]; then active_row=$(( ${#options[@]} / $colmax )); fi;;
|
fi
|
||||||
left) ((active_col=$active_col - 1));
|
done
|
||||||
if [ $active_col -lt 0 ]; then active_col=0; fi;;
|
|
||||||
right) ((active_col=$active_col + 1));
|
# Read user input
|
||||||
if [ $active_col -ge $colmax ]; then active_col=$(( $colmax - 1 )) ; fi;;
|
read -rsn1 key
|
||||||
|
case $key in
|
||||||
|
$'\x1b') # ESC sequence
|
||||||
|
read -rsn2 -t 0.1 key
|
||||||
|
case $key in
|
||||||
|
'[A') # Up arrow
|
||||||
|
((selected--))
|
||||||
|
if [ $selected -lt 0 ]; then
|
||||||
|
selected=$((num_options - 1))
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
'[B') # Down arrow
|
||||||
|
((selected++))
|
||||||
|
if [ $selected -ge $num_options ]; then
|
||||||
|
selected=0
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
'') # Enter key
|
||||||
|
break
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
# cursor position back to normal
|
return $selected
|
||||||
cursor_to $lastrow
|
|
||||||
printf "\n"
|
|
||||||
cursor_blink_on
|
|
||||||
|
|
||||||
return $(( $active_col + $active_row * $colmax ))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# @description Displays ArchTitus logo
|
# @description Displays ArchTitus logo
|
||||||
# @noargs
|
# @noargs
|
||||||
logo () {
|
logo () {
|
||||||
|
|
@ -210,7 +147,7 @@ echo -ne "
|
||||||
Please Select your file system for both boot and root
|
Please Select your file system for both boot and root
|
||||||
"
|
"
|
||||||
options=("btrfs" "ext4" "luks" "exit")
|
options=("btrfs" "ext4" "luks" "exit")
|
||||||
select_option $? 1 "${options[@]}"
|
select_option "${options[@]}"
|
||||||
|
|
||||||
case $? in
|
case $? in
|
||||||
0) export FS=btrfs;;
|
0) export FS=btrfs;;
|
||||||
|
|
@ -232,7 +169,7 @@ System detected your timezone to be '$time_zone' \n"
|
||||||
echo -ne "Is this correct?
|
echo -ne "Is this correct?
|
||||||
"
|
"
|
||||||
options=("Yes" "No")
|
options=("Yes" "No")
|
||||||
select_option $? 1 "${options[@]}"
|
select_option "${options[@]}"
|
||||||
|
|
||||||
case ${options[$?]} in
|
case ${options[$?]} in
|
||||||
y|Y|yes|Yes|YES)
|
y|Y|yes|Yes|YES)
|
||||||
|
|
@ -253,7 +190,7 @@ Please select key board layout from this list"
|
||||||
# These are default key maps as presented in official arch repo archinstall
|
# These are default key maps as presented in official arch repo archinstall
|
||||||
options=(us by ca cf cz de dk es et fa fi fr gr hu il it lt lv mk nl no pl ro ru sg ua uk)
|
options=(us by ca cf cz de dk es et fa fi fr gr hu il it lt lv mk nl no pl ro ru sg ua uk)
|
||||||
|
|
||||||
select_option $? 4 "${options[@]}"
|
select_option "${options[@]}"
|
||||||
keymap=${options[$?]}
|
keymap=${options[$?]}
|
||||||
|
|
||||||
echo -ne "Your key boards layout: ${keymap} \n"
|
echo -ne "Your key boards layout: ${keymap} \n"
|
||||||
|
|
@ -267,7 +204,7 @@ Is this an ssd? yes/no:
|
||||||
"
|
"
|
||||||
|
|
||||||
options=("Yes" "No")
|
options=("Yes" "No")
|
||||||
select_option $? 1 "${options[@]}"
|
select_option "${options[@]}"
|
||||||
|
|
||||||
case ${options[$?]} in
|
case ${options[$?]} in
|
||||||
y|Y|yes|Yes|YES)
|
y|Y|yes|Yes|YES)
|
||||||
|
|
@ -295,7 +232,7 @@ PS3='
|
||||||
Select the disk to install on: '
|
Select the disk to install on: '
|
||||||
options=($(lsblk -n --output TYPE,KNAME,SIZE | awk '$1=="disk"{print "/dev/"$2"|"$3}'))
|
options=($(lsblk -n --output TYPE,KNAME,SIZE | awk '$1=="disk"{print "/dev/"$2"|"$3}'))
|
||||||
|
|
||||||
select_option $? 1 "${options[@]}"
|
select_option "${options[@]}"
|
||||||
disk=${options[$?]%|*}
|
disk=${options[$?]%|*}
|
||||||
|
|
||||||
echo -e "\n${disk%|*} selected \n"
|
echo -e "\n${disk%|*} selected \n"
|
||||||
|
|
@ -516,7 +453,7 @@ nc=$(grep -c ^processor /proc/cpuinfo)
|
||||||
echo -ne "
|
echo -ne "
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
You have " $nc" cores. And
|
You have " $nc" cores. And
|
||||||
changing the makeflags for "$nc" cores. Aswell as
|
changing the makeflags for " $nc" cores. Aswell as
|
||||||
changing the compression settings.
|
changing the compression settings.
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
"
|
"
|
||||||
|
|
@ -560,11 +497,9 @@ proc_type=$(lscpu)
|
||||||
if grep -E "GenuineIntel" <<< ${proc_type}; then
|
if grep -E "GenuineIntel" <<< ${proc_type}; then
|
||||||
echo "Installing Intel microcode"
|
echo "Installing Intel microcode"
|
||||||
pacman -S --noconfirm --needed intel-ucode
|
pacman -S --noconfirm --needed intel-ucode
|
||||||
proc_ucode=intel-ucode.img
|
|
||||||
elif grep -E "AuthenticAMD" <<< ${proc_type}; then
|
elif grep -E "AuthenticAMD" <<< ${proc_type}; then
|
||||||
echo "Installing AMD microcode"
|
echo "Installing AMD microcode"
|
||||||
pacman -S --noconfirm --needed amd-ucode
|
pacman -S --noconfirm --needed amd-ucode
|
||||||
proc_ucode=amd-ucode.img
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -ne "
|
echo -ne "
|
||||||
|
|
@ -587,17 +522,15 @@ fi
|
||||||
# Loop through user input until the user gives a valid username
|
# Loop through user input until the user gives a valid username
|
||||||
while true
|
while true
|
||||||
do
|
do
|
||||||
read -p "Please enter username:" username
|
read -p "Please enter username:" USERNAME
|
||||||
# username regex per response here https://unix.stackexchange.com/questions/157426/what-is-the-regex-to-validate-linux-users
|
|
||||||
# lowercase the username to test regex
|
|
||||||
if [[ "${username,,}" =~ ^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\$)$ ]]
|
if [[ "${username,,}" =~ ^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}\$)$ ]]
|
||||||
then
|
then
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
echo "Incorrect username."
|
echo "Incorrect username."
|
||||||
done
|
done
|
||||||
#Set Password
|
|
||||||
read -p "Please enter password:" password
|
read -p "Please enter password:" PASSWORD
|
||||||
|
|
||||||
# Loop through user input until the user gives a valid hostname, but allow the user to force save
|
# Loop through user input until the user gives a valid hostname, but allow the user to force save
|
||||||
while true
|
while true
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user