From 6be469d5f21309fe80d927d277d37a99db22b511 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 1 Dec 2012 23:28:59 -0500 Subject: consolefont: fix reference to consolefont variable Broken by ac8499c08279b05d. FS#32935. https://bbs.archlinux.org/viewtopic.php?id=153982 Signed-off-by: Dave Reisner --- install/consolefont | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/consolefont b/install/consolefont index bbcd7ec..c10b65d 100644 --- a/install/consolefont +++ b/install/consolefont @@ -5,8 +5,8 @@ build() { ( [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf - if [[ $CONSOLEFONT ]]; then - for file in "/usr/share/kbd/consolefonts/$CONSOLEFONT".@(fnt|psf?(u))?(.gz); do + if [[ $FONT ]]; then + for file in "/usr/share/kbd/consolefonts/$FONT".@(fnt|psf?(u))?(.gz); do if [[ -e $file ]]; then [[ $file =~ (\.(fnt|psfu?))(\.gz)?$ ]] && ext=${BASH_REMATCH[2]} if [[ $file = *.gz ]]; then @@ -17,7 +17,7 @@ build() { exit 0 fi done - error "consolefont: requested font not found: \`%s'" "$CONSOLEFONT" + error "consolefont: requested font not found: \`%s'" "$FONT" exit 1 else warning "consolefont: no font found in configuration" @@ -28,7 +28,7 @@ build() { help() { cat <