From 3d91b06198a56b6579cb0bd77de65f5908571b87 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 7 Nov 2008 21:42:58 -0600 Subject: change the location of mysql.txt to match the installation dir of mythtv. This fixes FE only install types --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/systemconfig.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 80ff873..521e665 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=2 +pkgrel=3 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan) diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh index ba6325b..a12546a 100755 --- a/abs/core-testing/LinHES-config/systemconfig.sh +++ b/abs/core-testing/LinHES-config/systemconfig.sh @@ -85,18 +85,18 @@ function setupmysql { fi fi - MYSQLTXT=${BASE}/usr/local/share/mythtv/mysql.txt + MYSQLTXT=${BASE}/usr/share/mythtv/mysql.txt if [ $SystemType = "Standalone" ] then sed -e "s/^DBHostName=.*$/DBHostName="localhost"/" $TEMPLATES/mysql.txt > $MYSQLTXT else sed -e "s/^DBHostName=.*$/DBHostName=$dbhost/" $TEMPLATES/mysql.txt > $MYSQLTXT fi - rm ${BASE}/data/home/mythtv/.mythtv/mysql.txt + rm ${BASE}/home/mythtv/.mythtv/mysql.txt rm ${BASE}${MV_ROOT}/bin/mythtv/.mythtv/mysql.txt - if [ -f ${BASE}/data/home/mythtv/templates/mysql.txt ] + if [ -f ${BASE}/home/mythtv/templates/mysql.txt ] then - cp ${BASE}/data/home/mythtv/templates/mysql.txt $MYSQLTXT + cp ${BASE}/home/mythtv/templates/mysql.txt $MYSQLTXT fi chmod 755 $MYSQLTXT -- cgit v0.12