Support for null FONT config on terminal

diff --git a/terminal b/terminal
index 955c0a1dc3a09f20330fca89a16f62c3a3fafc4e..57f7bf403f140253db3d02738fae609d2b01ea55 100755 (executable)
--- a/terminal
+++ b/terminal
@@ -17,26 +17,31 @@ if [ ! -z "$GEOMETRY" ]; then
   DIMENSIONS="-g $GEOMETRY"
 fi
 
+if [ ! -z "$FONT" ]; then
+  F_FONT="-F $FONT"
+  FN_FONT="-fn $FONT"
+fi
+
 if [ "$TERM" == "rxvt" ]; then
   if [ ! -z "$1" ]; then
-    rxvt-unicode -bg black +sb -fg white -fn $FONT $DIMENSIONS -title $TITLE \
+    rxvt-unicode -bg black +sb -fg white $FN_FONT $DIMENSIONS -title $TITLE \
                  -e bash -rcfile $HOME/.terminal -c "$*"
   else
-    rxvt-unicode -bg black +sb -fg white -fn $FONT $DIMENSIONS -title $TITLE \
+    rxvt-unicode -bg black +sb -fg white $FN_FONT $DIMENSIONS -title $TITLE \
                  -e bash -rcfile $HOME/.terminal
   fi
 elif [ "$TERM" == "Eterm" ]; then
   if [ ! -z "$1" ]; then
-    Eterm  --background-pixmap 0 --scrollbar 0 +sb -b black -f white -F $FONT --borderless no \
+    Eterm  --background-pixmap 0 --scrollbar 0 +sb -b black -f white $F_FONT --borderless no \
            --buttonbar 0 $DIMENSIONS -n$TITLE -e bash -rcfile $HOME/.terminal -c "$*"
   else
-    Eterm  --background-pixmap 0 --scrollbar 0 +sb -b black -f white -F $FONT --borderless no \
+    Eterm  --background-pixmap 0 --scrollbar 0 +sb -b black -f white $F_FONT --borderless no \
            --buttonbar 0 $DIMENSIONS -n$TITLE -e bash -rcfile $HOME/.terminal
   fi
 elif [ "$TERM" == "xterm" ]; then
   if [ ! -z "$1" ]; then
-    xterm -u8 -fn $FONT -geometry $GEOMETRY -title $TITLE -e bash -c "$*"
+    xterm -u8 $FN_FONT -geometry $GEOMETRY -title $TITLE -e bash -c "$*"
   else
-    xterm -u8 -fn $FONT -geometry $GEOMETRY -title $TITLE -e bash
+    xterm -u8 $FN_FONT -geometry $GEOMETRY -title $TITLE -e bash
   fi
 fi