xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option to skip font selection

Browse Source
This commit is contained in:
natemaia 2021-05-05 15:44:00 -07:00
parent b8c308d736
commit 20844b6342
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
installer
View File

@ -6,7 +6,7 @@
# AIF, Calamares, and the Arch Wiki.. Credit where credit is due # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
# shellcheck disable=SC2086,SC2046,SC2254,SC2164 # shellcheck disable=SC2086,SC2046,SC2254,SC2164
VER=2.6 VER=2.7
# default values { # default values {
@ -3116,6 +3116,7 @@ usage()
options: options:
-h print this message and exit -h print this message and exit
-f skip setting the font size
-l install and setup a live session -l install and setup a live session
-D enable xtrace and log output to $DBG -D enable xtrace and log output to $DBG
-c disable network connection tests -c disable network connection tests
@ -3520,7 +3521,7 @@ fi
trap 'printf "\n^C\n" && die 1' INT trap 'printf "\n^C\n" && die 1' INT
while getopts ":htcnrD:b:m:d:l:" OPT; do while getopts ":htcnrfD:b:m:d:l:" OPT; do
case "$OPT" in case "$OPT" in
D) debug ;; D) debug ;;
h) usage "$0" ;; h) usage "$0" ;;
@ -3529,6 +3530,7 @@ while getopts ":htcnrD:b:m:d:l:" OPT; do
m) MNT="$OPTARG" ;; m) MNT="$OPTARG" ;;
d) DIST="$OPTARG" ;; d) DIST="$OPTARG" ;;
c) NONET=true ;; c) NONET=true ;;
f) NOFONT=true ;;
r) r)
if [[ ! -b $OPTARG ]]; then if [[ ! -b $OPTARG ]]; then
msg "Invalid Root" "\nThe installer expects a full path to a block device for root, e.g. /dev/sda2.\n\nExiting..\n" 2 msg "Invalid Root" "\nThe installer expects a full path to a block device for root, e.g. /dev/sda2.\n\nExiting..\n" 2
@ -3580,23 +3582,25 @@ if [[ $NOMOUNT ]]; then
fi fi
fi fi
if [[ $TERM == 'linux' ]]; then if [[ -z $NOFONT ]]; then
if [[ -f /tmp/font ]]; then if [[ $TERM == 'linux' ]]; then
FONT="$(< /tmp/font)" if [[ -f /tmp/font ]]; then
: "${FONT=ter-i16n}" FONT="$(< /tmp/font)"
setfont "$FONT" : "${FONT=ter-i16n}"
else
fontsize=16
while [[ $TERM == 'linux' && ! -f /tmp/font ]]; do
dlg fontsize menu "Font Size" "\nSelect a font size from the list below.\n\ndefault: 16" \
12 "setfont ter-i12n" 14 "setfont ter-i14n" 16 "setfont ter-i16n" 18 "setfont ter-i18n" \
20 "setfont ter-i20n" 22 "setfont ter-i22n" 24 "setfont ter-i24n" 28 "setfont ter-i28n" \
32 "setfont ter-i32n" || break
FONT="ter-i${fontsize}n"
setfont "$FONT" setfont "$FONT"
yesno "Font Size" "\nKeep the currently set font size?\n" && echo "ter-i${fontsize}n" > /tmp/font else
done fontsize=16
while [[ $TERM == 'linux' && ! -f /tmp/font ]]; do
dlg fontsize menu "Font Size" "\nSelect a font size from the list below.\n\ndefault: 16" \
12 "setfont ter-i12n" 14 "setfont ter-i14n" 16 "setfont ter-i16n" 18 "setfont ter-i18n" \
20 "setfont ter-i20n" 22 "setfont ter-i22n" 24 "setfont ter-i24n" 28 "setfont ter-i28n" \
32 "setfont ter-i32n" || break
FONT="ter-i${fontsize}n"
setfont "$FONT"
yesno "Font Size" "\nKeep the currently set font size?\n" && echo "ter-i${fontsize}n" > /tmp/font
done
fi
fi fi
fi fi