aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-02-28 21:09:22 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-02-28 21:09:22 +0000
commit8e3e48b58e1cc54fa988ca7c5bedb2ccff7b40a3 (patch)
tree2327d639abebe94fdc73e3a01d1d3637c8226826
parentchanged debug-message for NPTL-off to be less confusing (diff)
downloadgentoo-vdr-scripts-8e3e48b58e1cc54fa988ca7c5bedb2ccff7b40a3.tar.gz
gentoo-vdr-scripts-8e3e48b58e1cc54fa988ca7c5bedb2ccff7b40a3.tar.bz2
gentoo-vdr-scripts-8e3e48b58e1cc54fa988ca7c5bedb2ccff7b40a3.zip
only read setup.conf if existing
svn path=/gentoo-vdr-scripts/trunk/; revision=174
-rw-r--r--ChangeLog4
-rw-r--r--usr/lib/vdr/inc/language-functions.sh6
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d656807..8a98969 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
# $Id$
28 Feb 2006; Matthias Schwarzott <zzam@gentoo.org>
+ usr/lib/vdr/inc/language-functions.sh:
+ only read setup.conf if existing
+
+ 28 Feb 2006; Matthias Schwarzott <zzam@gentoo.org>
usr/lib/vdr/rcscript/pre-start-45-nptl-check.sh:
changed debug-message for NPTL-off to be less confusing
diff --git a/usr/lib/vdr/inc/language-functions.sh b/usr/lib/vdr/inc/language-functions.sh
index db327be..6b6759d 100644
--- a/usr/lib/vdr/inc/language-functions.sh
+++ b/usr/lib/vdr/inc/language-functions.sh
@@ -2,7 +2,11 @@
read_vdr_language() {
local OSDLANG
local LANG_TAB
- OSDLANG=$(awk -F= '/^OSDLanguage/ { print $2 }' /etc/vdr/setup.conf)
+ if [[ -f /etc/vdr/setup.conf ]]; then
+ OSDLANG=$(awk -F= '/^OSDLanguage/ { print $2 }' /etc/vdr/setup.conf)
+ else
+ OSDLANG="0"
+ fi
LANG_TAB=("en" "de")
VDR_LANGUAGE=${LANG_TAB[OSDLANG]}
}