More basic title headers and de-branding
This commit is contained in:
natemaia
parent
3e88c39002
commit
eec9ce43f0
32
installer
32
installer
@ -399,7 +399,7 @@ main()
|
||||
if [[ $NOMOUNT ]]; then
|
||||
(( SEL < 8 )) && (( SEL++ ))
|
||||
tput civis
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Prepare " \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --title " Prepare " \
|
||||
--default-item $SEL --cancel-label 'Exit' --menu "$_prep" 0 0 0 \
|
||||
1 "* Select bootloader" \
|
||||
2 "* Username and password" \
|
||||
@ -425,7 +425,7 @@ main()
|
||||
else
|
||||
(( SEL < 13 )) && (( SEL++ ))
|
||||
tput civis
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Prepare " \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --title " Prepare " \
|
||||
--default-item $SEL --cancel-label 'Exit' --menu "$_prep" 0 0 0 \
|
||||
1 "Storage management" \
|
||||
2 "* Mount partitions" \
|
||||
@ -615,7 +615,7 @@ select_mkuser()
|
||||
|
||||
until [[ $NEWUSER ]]; do
|
||||
tput cnorm
|
||||
dialog --insecure --backtitle "$DIST Installer - $SYS - v$VER" \
|
||||
dialog --insecure --backtitle "$DIST - $SYS - v$VER" \
|
||||
--separator $'\n' --title " User " --mixedform "$_user" 0 0 0 \
|
||||
"Username:" 1 1 "${ans[0]}" 1 11 "$COLUMNS" 0 0 \
|
||||
"Password:" 2 1 '' 2 11 "$COLUMNS" 0 1 \
|
||||
@ -2877,7 +2877,7 @@ luks_pass()
|
||||
|
||||
until [[ $LUKS_PASS ]]; do
|
||||
tput cnorm
|
||||
dialog --insecure --backtitle "$DIST Installer - $SYS - v$VER" \
|
||||
dialog --insecure --backtitle "$DIST - $SYS - v$VER" \
|
||||
--separator $'\n' --title " $t " --mixedform "$_luksomenu" 0 0 0 \
|
||||
"Name:" 1 1 "${ans[0]}" 1 7 "$COLUMNS" 0 0 \
|
||||
"Password:" 2 1 '' 2 11 "$COLUMNS" 0 1 \
|
||||
@ -2997,12 +2997,12 @@ dlg()
|
||||
case "$dlg_t" in
|
||||
menu)
|
||||
tput civis
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --title " $title " \
|
||||
--menu "$body" 0 0 $n "$@" 2> "$ANS" || return 1
|
||||
;;
|
||||
check)
|
||||
tput civis
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --title " $title " \
|
||||
--checklist "$body" 0 0 $n "$@" 2> "$ANS" || return 1
|
||||
;;
|
||||
input)
|
||||
@ -3012,10 +3012,10 @@ dlg()
|
||||
shift
|
||||
fi
|
||||
if [[ $1 == 'limit' ]]; then
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --max-input 63 \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --max-input 63 \
|
||||
--title " $title " --inputbox "$body" 0 0 "$def" 2> "$ANS" || return 1
|
||||
else
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --title " $title " \
|
||||
--inputbox "$body" 0 0 "$def" 2> "$ANS" || return 1
|
||||
fi
|
||||
;;
|
||||
@ -3033,9 +3033,9 @@ msg()
|
||||
shift 2
|
||||
tput civis
|
||||
if (( $# )); then
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --sleep "$1" --title " $title " --infobox "$body\n" 0 0
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --sleep "$1" --title " $title " --infobox "$body\n" 0 0
|
||||
else
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --msgbox "$body\n" 0 0
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --title " $title " --msgbox "$body\n" 0 0
|
||||
fi
|
||||
}
|
||||
|
||||
@ -3160,10 +3160,10 @@ yesno()
|
||||
(( $# >= 4 )) && no="$4"
|
||||
tput civis
|
||||
if (( $# == 5 )); then
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --defaultno \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --defaultno \
|
||||
--title " $title " --yes-label "$yes" --no-label "$no" --yesno "$body\n" 0 0
|
||||
else
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --title " $title " \
|
||||
--yes-label "$yes" --no-label "$no" --yesno "$body\n" 0 0
|
||||
fi
|
||||
}
|
||||
@ -3254,12 +3254,12 @@ errshow()
|
||||
|
||||
if (( fatal )); then
|
||||
read -re -p $'\nAn error occurred.. Press [Enter] when ready to continue to error dialog'
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Install Error " --yes-label "Abort" --no-label "Continue" \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --title " Install Error " --yes-label "Abort" --no-label "Continue" \
|
||||
--yesno "${txt}Errors at this stage must be fixed before the install can continue.\n$_errchoice\n" 0 0 || return 0
|
||||
[[ -r $DBG && $TERM == 'linux' ]] && less "$DBG"
|
||||
die 1
|
||||
fi
|
||||
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Install Error " --yes-label "Abort" --no-label "Continue" \
|
||||
dialog --backtitle "$DIST - $SYS - v$VER" --title " Install Error " --yes-label "Abort" --no-label "Continue" \
|
||||
--yesno "${txt}Errors at this stage may not be serious depending on the command and error type.\n$_errchoice\n" 0 0 || return 0
|
||||
|
||||
tput civis
|
||||
@ -3511,7 +3511,7 @@ if [[ $TERM == 'linux' ]]; then
|
||||
fi
|
||||
|
||||
if [[ ! -f /tmp/weld ]]; then
|
||||
msg "Welcome to the $DIST Installer" "\nThis will help you get $DIST installed and setup on your system.\n\nIf you are unsure about an option, the default or most common option\nwill be described, if it is not the first selected entry will be the default.\n\n\nMenu Navigation:\n\n - Select items with the arrow keys or the highlighted key.\n - Repeatedly pressing the highlighted key for an option will cycle through options beginning with that key.\n - Use [Space] to toggle check boxes and [Enter] to accept selection.\n - Use [Escape] or select the cancel/exit button to exit a menu or dialog.\n - Switch between fields using [Tab] or the arrow keys.\n - Use [Page Up] and [Page Down] to jump whole pages.\n"
|
||||
msg "Welcome" "\nThis script will help you get $DIST installed and setup on your system.\n\nIf you are unsure about an option, the default or most common option\nwill be described, if it is not the first selected entry will be the default.\n\n\nMenu Navigation:\n\n - Select items with the arrow keys or the highlighted key.\n - Repeatedly pressing the highlighted key for an option will cycle through options beginning with that key.\n - Use [Space] to toggle check boxes and [Enter] to accept selection.\n - Use [Escape] or select the cancel/exit button to exit a menu or dialog.\n - Switch between fields using [Tab] or the arrow keys.\n - Use [Page Up] and [Page Down] to jump whole pages.\n"
|
||||
touch /tmp/weld
|
||||
fi
|
||||
|
||||
@ -3524,7 +3524,7 @@ elif ! net_connect; then
|
||||
fi
|
||||
|
||||
if [[ ! -f /tmp/new ]]; then
|
||||
msg "Installer Update" "\nChecking for newer installer versions.\n" 1
|
||||
msg "Update" "\nChecking for newer installer versions.\n" 1
|
||||
if curl -fsSL 'https://bitbucket.org/archlabslinux/installer/raw/master/installer' -o /tmp/new; then
|
||||
if (( $(vercmp "$(awk -F= '/^VER=/ {print $2}' /tmp/new)" "$VER") > 0 )); then
|
||||
cp /tmp/new /usr/bin/installer
|
||||
|
||||
Reference in New Issue
Block a user