[arch-projects] [mkinitcpio] [PATCH 2/6] install/consolefont: Bashify install script

Kurt J. Bosch kjb-temp-2009 at alpenjodel.de
Sat Jul 23 07:21:02 EDT 2011


mkinitcpio itself is in BASH, so use it.
Also add BASH shebang and move the vim line to the end to ease looking into this with other editors.
---
 install/consolefont |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/install/consolefont b/install/consolefont
index 8c1fa8c..e12cc4f 100644
--- a/install/consolefont
+++ b/install/consolefont
@@ -1,19 +1,18 @@
-# vim: set ft=sh:
+#!/bin/bash
 
-build()
-{
+build() {
     MODULES=""
     BINARIES=""
     FILES=""
     SCRIPT="consolefont"
     eval "$(grep -e "^CONSOLEFONT=" /etc/rc.conf)"
-    if [ -n "$CONSOLEFONT" ]; then
-        if [ -e /usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz ]; then
+    if [[ $CONSOLEFONT ]]; then
+        if [[ -e /usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz ]]; then
             CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz"
             CONSOLEFONT_FILE="$(mktemp ${TMPDIR}/consolefont.psfu.XXXXXX)"
             zcat ${CONSOLEFONT_FILE_GZ} > ${CONSOLEFONT_FILE}
             add_file ${CONSOLEFONT_FILE} /consolefont.psfu
-        elif [ -e /usr/share/kbd/consolefonts/$CONSOLEFONT.psf.gz ]; then
+        elif [[ -e /usr/share/kbd/consolefonts/$CONSOLEFONT.psf.gz ]]; then
             CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psf.gz"
             CONSOLEFONT_FILE="$(mktemp ${TMPDIR}/consolefont.psf.XXXXXX)"
             zcat ${CONSOLEFONT_FILE_GZ} > ${CONSOLEFONT_FILE}
@@ -24,9 +23,10 @@ build()
     fi
 }
 
-help ()
-{
+help () {
     cat<<HELPEOF
 This hook loads consolefont specified in rc.conf during early userspace.
 HELPEOF
 }
+
+# vim: set ft=sh:
-- 
1.7.1



More information about the arch-projects mailing list