[arch-commits] Commit in cmatrix/trunk (PKGBUILD cmatrix-tty)

[Kyle Keen]

    Date: Sunday, January 25, 2015 @ 12:55:11
  Author: kkeen
Revision: 126568

upgpkg: cmatrix 1.2a-10 FS#43402

Modified:
  cmatrix/trunk/PKGBUILD
  cmatrix/trunk/cmatrix-tty

-------------+
 PKGBUILD    |    6 +++---
 cmatrix-tty |   10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-25 11:39:07 UTC (rev 126567)
+++ PKGBUILD	2015-01-25 11:55:11 UTC (rev 126568)
@@ -3,7 +3,7 @@
 
 pkgname=cmatrix
 pkgver=1.2a
-pkgrel=9
+pkgrel=10
 pkgdesc="A curses-based scrolling 'Matrix'-like screen"
 arch=('i686' 'x86_64')
 url="http://www.asty.org/cmatrix/"
@@ -11,13 +11,13 @@
 depends=('ncurses')
 makedepends=('fontconfig')
 optdepends=('fontconfig: custom font'
-            'kdb: cmatrix-tty custom font'
+            'kbd: cmatrix-tty custom font'
             'xterm: cmatrix-tty custom font')
 install=$pkgname.install
 source=("http://www.asty.org/$pkgname/dist/$pkgname-$pkgver.tar.gz"
         "cmatrix-tty")
 md5sums=('ebfb5733104a258173a9ccf2669968a1'
-         'db4371d5cb649973bfea31c2b932d260')
+         '6bb2431c23350cb2082e14b6ba761760')
 
 build() {
   cd $pkgname-$pkgver

Modified: cmatrix-tty
===================================================================
--- cmatrix-tty	2015-01-25 11:39:07 UTC (rev 126567)
+++ cmatrix-tty	2015-01-25 11:55:11 UTC (rev 126568)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # a basic script for maximum pretty
 
@@ -25,9 +25,15 @@
 # and put the font back, if possible
 default_font=""
 if [[ -f /etc/vconsole.conf ]]; then
-    default_font="$(grep '^[ \t]*FONT' /etc/vconsole.conf | cut -d '=' -f 2)"
+    while IFS='=' read -r k v; do
+        if [ "${k# *}" = FONT ]; then
+             default_font="$v"
+        fi
+    done < /etc/vconsole.conf
 fi
 if [[ -n "$default_font" ]]; then
     setfont "$default_font"
+else
+    echo "No font in vconsole.conf, could not restore."
 fi