Add option to skip font selection
This commit is contained in:
parent
b8c308d736
commit
20844b6342
@ -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,6 +3582,7 @@ if [[ $NOMOUNT ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -z $NOFONT ]]; then
|
||||||
if [[ $TERM == 'linux' ]]; then
|
if [[ $TERM == 'linux' ]]; then
|
||||||
if [[ -f /tmp/font ]]; then
|
if [[ -f /tmp/font ]]; then
|
||||||
FONT="$(< /tmp/font)"
|
FONT="$(< /tmp/font)"
|
||||||
@ -3599,6 +3602,7 @@ if [[ $TERM == 'linux' ]]; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ ! -f /tmp/weld ]]; then
|
if [[ ! -f /tmp/weld ]]; then
|
||||||
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"
|
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"
|
||||||
|
Reference in New Issue
Block a user