Add option to skip font selection
This commit is contained in:
parent
b8c308d736
commit
20844b6342
10
installer
10
installer
@ -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,7 +3582,8 @@ if [[ $NOMOUNT ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $TERM == 'linux' ]]; then
|
if [[ -z $NOFONT ]]; then
|
||||||
|
if [[ $TERM == 'linux' ]]; then
|
||||||
if [[ -f /tmp/font ]]; then
|
if [[ -f /tmp/font ]]; then
|
||||||
FONT="$(< /tmp/font)"
|
FONT="$(< /tmp/font)"
|
||||||
: "${FONT=ter-i16n}"
|
: "${FONT=ter-i16n}"
|
||||||
@ -3598,6 +3601,7 @@ if [[ $TERM == 'linux' ]]; then
|
|||||||
yesno "Font Size" "\nKeep the currently set font size?\n" && echo "ter-i${fontsize}n" > /tmp/font
|
yesno "Font Size" "\nKeep the currently set font size?\n" && echo "ter-i${fontsize}n" > /tmp/font
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -f /tmp/weld ]]; then
|
if [[ ! -f /tmp/weld ]]; then
|
||||||
|
Reference in New Issue
Block a user