From ad894491177cc6b401ee07dd58ddbfd1226811f9 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 30 Aug 2012 19:32:55 -0500
Subject: LinHES-config: removing references to /home/mythv
install_functions.sh added function home_check to aid in removing references to /home/mythtv
MythVantage.sh : setup MYTHHOME
soundconfig and xconfig both had references but were not used
---
abs/core/LinHES-config/MythVantage.sh | 2 ++
abs/core/LinHES-config/install_functions.sh | 15 +++++++++++++++
abs/core/LinHES-config/soundconfig.sh | 10 ++++++----
abs/core/LinHES-config/xconfig.sh | 6 +++++-
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/abs/core/LinHES-config/MythVantage.sh b/abs/core/LinHES-config/MythVantage.sh
index 286c908..ffa8d34 100755
--- a/abs/core/LinHES-config/MythVantage.sh
+++ b/abs/core/LinHES-config/MythVantage.sh
@@ -1,3 +1,5 @@
export MV_ROOT=/usr/MythVantage
export PATH=$PATH:$MV_ROOT/bin
export TEMPLATES=$MV_ROOT/templates
+results=`grep MYTHHOME $MV_ROOT/bin/mv_config.py`
+eval export $results
diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh
index 69d978d..fd33e00 100755
--- a/abs/core/LinHES-config/install_functions.sh
+++ b/abs/core/LinHES-config/install_functions.sh
@@ -395,6 +395,21 @@ function init_remote {
fi
}
+function home_check(){
+ #This bit of code is used to determine where mythhome is located
+ if [ x$MYTHHOME = x ]
+ then
+ . /etc/profile.d/MythVantage.sh
+ fi
+
+ if [ x$MYTHHOME = x ]
+ then
+ echo "MYTHHOME not defined!"
+ exit 1
+ fi
+
+ }
+
#-----------------------
diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh
index c4e1cc7..b9eb906 100755
--- a/abs/core/LinHES-config/soundconfig.sh
+++ b/abs/core/LinHES-config/soundconfig.sh
@@ -10,6 +10,8 @@ TESTFILE="/usr/share/sounds/alsa/Front_Center.wav"
OSSinstalled="false"
BLACKLIST=/etc/modprobe.d/soundconfig_blacklist.conf
+. /usr/MythVantage/bin/install_functions.sh
+home_check
echo "---------------------------------------"
@@ -86,9 +88,9 @@ function installOSS {
function SYNCXINE {
echo "modify xine config file"
- if [ -f /data/home/mythtv/.xine/config ]
+ if [ -f $MYTHHOME/.xine/config ]
then
- cp -f /data/home/mythtv/.xine/config $TEMPLATES/xine.config
+ cp -f $MYTHHOME/.xine/config $TEMPLATES/xine.config
else
cp $TEMPLATES/xine.config.template $TEMPLATES/xine.config
fi
@@ -100,9 +102,9 @@ echo "modify xine config file"
-e "s/^.audio.device.oss_device_name.*$/audio.device.oss_device_name:\/dev\/dsp/" \
-e "s/^.audio.devic.oss_device_number.*$/audio.device.oss_device_number:$DEVICENUMER/" \
-e "s/^.*audio.output.speaker_arrangement:.*$/Audio.output.speaker_arrangement:PassThrough/" \
- $TEMPLATES/xine.config > /data/home/mythtv/.xine/config
+ $TEMPLATES/xine.config > $MYTHHOME/.xine/config
else
- cp $TEMPLATES/xine.config /data/home/mythtv/.xine/config
+ cp $TEMPLATES/xine.config $MYTHHOME/.xine/config
fi
}
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index c796047..504da81 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -14,7 +14,11 @@ BASE=""
MYTH_RUN_STATUS="1"
. /etc/profile
-MYTHHOME=$BASE/home/mythtv
+#MYTHHOME=$BASE/home/mythtv
+
+. /usr/MythVantage/bin/install_functions.sh
+home_check
+
function Xvalues {
CMDLINE=$(cat /proc/cmdline)
--
cgit v0.12