[arch-projects] [mkinitcpio] [PATCH 4/6] install/consolefont: Fix quoting
Kurt J. Bosch
kjb-temp-2009 at alpenjodel.de
Sat Jul 23 07:21:04 EDT 2011
Quoting is not needed in assignments, so use the same style as with [[ ]].
Quoting might be needed for postional parameters because $CONSOLEFONT and $TEMDIR are configuration/command-line parameters.
fix
---
install/consolefont | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/install/consolefont b/install/consolefont
index 9337d49..f0512bb 100644
--- a/install/consolefont
+++ b/install/consolefont
@@ -8,15 +8,15 @@ build() {
CONSOLEFONT=$( . /etc/rc.conf; echo "$CONSOLEFONT" )
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
+ 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
- CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psf.gz"
- CONSOLEFONT_FILE="$(mktemp ${TMPDIR}/consolefont.psf.XXXXXX)"
- zcat ${CONSOLEFONT_FILE_GZ} > ${CONSOLEFONT_FILE}
- add_file ${CONSOLEFONT_FILE} /consolefont.psf
+ CONSOLEFONT_FILE_GZ=/usr/share/kbd/consolefonts/$CONSOLEFONT.psf.gz
+ CONSOLEFONT_FILE=$(mktemp ${TMPDIR}/consolefont.psf.XXXXXX)
+ zcat "${CONSOLEFONT_FILE_GZ}" > "${CONSOLEFONT_FILE}"
+ add_file "${CONSOLEFONT_FILE}" /consolefont.psf
else
echo "consolefont: Font file does not exist or does not end with .psf.gz or .psfu.gz."
fi
--
1.7.1
More information about the arch-projects
mailing list