Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=372f42c74444940ed2e040d784a7614f86b43e06

commit 372f42c74444940ed2e040d784a7614f86b43e06
Author: James Buren <[email protected]>
Date:   Fri Dec 7 07:03:07 2012 -0600

bash-4.2_039-2-x86_64
* add backwards compat for /etc/sysconfig/font and use new /etc/vconsole.conf
* this will be dropped after 1.8

diff --git a/source/base/bash/FrugalBuild b/source/base/bash/FrugalBuild
index e159a73..e176075 100644
--- a/source/base/bash/FrugalBuild
+++ b/source/base/bash/FrugalBuild
@@ -10,7 +10,7 @@ if [ -z "$patchver" ]; then
else
pkgver=${basever}_$patchver
fi
-pkgrel=1
+pkgrel=2
pkgdesc="The GNU Bourne Again shell"
url="http://tiswww.case.edu/php/chet/bash/bashtop.html";
backup=(etc/{profile,shells,skel/.bashrc})
diff --git a/source/base/bash/profile b/source/base/bash/profile
index 6549e67..aafa749 100644
--- a/source/base/bash/profile
+++ b/source/base/bash/profile
@@ -71,10 +71,16 @@ else
fi

if [ "$TERM" = "xterm" ]; then
-       TERM=xterm-color
+  TERM=xterm-color
elif [ "$TERM" = "linux" ]; then
-       . /etc/sysconfig/font
-       setfont $font
+# support for /etc/sysconfig/keymap and /etc/sysconfig/font can be dropped 
after 1.8
+  if [ -e /etc/sysconfig/font ]; then
+    . /etc/sysconfig/font
+    setfont $font
+  else if [ -e /etc/vconsole.conf ]; then
+    . /etc/vconsole.conf
+    setfont $FONT
+  fi
fi

# Notify user of incoming mail.  This can be overridden in the user's
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to