diff --git a/deb/debian/mythtv-common.config b/deb/debian/mythtv-common.config
index 41b3753..02a365b 100644
a
|
b
|
|
4 | 4 | |
5 | 5 | CONFIG=/etc/mythtv/config.xml |
6 | 6 | if [ -e $CONFIG ]; then |
7 | | db_set mythtv/mysql_mythtv_dbname "`xpath -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" |
8 | | db_set mythtv/mysql_mythtv_user "`xpath -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`" |
9 | | db_set mythtv/mysql_mythtv_password "`xpath -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`" |
10 | | db_set mythtv/mysql_host "`xpath -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`" |
| 7 | if [ "`xpath -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" = "" ]; then |
| 8 | db_set mythtv/mysql_mythtv_dbname "`xpath -q -e 'string(//DatabaseName)' $CONFIG 2>/dev/null`" |
| 9 | db_set mythtv/mysql_mythtv_user "`xpath -q -e 'string(//UserName)' $CONFIG 2>/dev/null`" |
| 10 | db_set mythtv/mysql_mythtv_password "`xpath -q -e 'string(//Password)' $CONFIG 2>/dev/null`" |
| 11 | db_set mythtv/mysql_host "`xpath -q -e 'string(//Host)' $CONFIG 2>/dev/null`" |
| 12 | else |
| 13 | ## This special case can be removed during the 14.10 dev cycle (it's only needed for upgrades from 0.25) |
| 14 | db_set mythtv/mysql_mythtv_dbname "`xpath -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" |
| 15 | db_set mythtv/mysql_mythtv_user "`xpath -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`" |
| 16 | db_set mythtv/mysql_mythtv_password "`xpath -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`" |
| 17 | db_set mythtv/mysql_host "`xpath -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`" |
| 18 | fi |
11 | 19 | fi |
12 | 20 | |
13 | 21 | db_input low mythtv/mysql_mythtv_dbname || true |
diff --git a/deb/debian/mythtv-common.postinst b/deb/debian/mythtv-common.postinst
index e272feb..3f1a451 100644
a
|
b
|
case "$1" in |
53 | 53 | |
54 | 54 | cat $INPUT > $NEW |
55 | 55 | |
56 | | perl -pi -e 's/(<DBHostName>).*?(<\/DBHostName>)/$1$ENV{'hostname'}$2/;' $NEW |
57 | | perl -pi -e 's/(<DBUserName>).*?(<\/DBUserName>)/$1$ENV{'mythtv_username'}$2/;' $NEW |
58 | | perl -pi -e 's/(<DBPassword>).*?(<\/DBPassword>)/$1$ENV{'mythtv_password'}$2/;' $NEW |
59 | | perl -pi -e 's/(<DBName>).*?(<\/DBName>)/$1$ENV{'database'}$2/;' $NEW |
| 56 | perl -pi -e 's/(<Host>).*?(<\/Host>)/$1$ENV{'hostname'}$2/;' $NEW |
| 57 | perl -pi -e 's/(<UserName>).*?(<\/UserName>)/$1$ENV{'mythtv_username'}$2/;' $NEW |
| 58 | perl -pi -e 's/(<Password>).*?(<\/Password>)/$1$ENV{'mythtv_password'}$2/;' $NEW |
| 59 | perl -pi -e 's/(<DatabaseName>).*?(<\/DatabaseName>)/$1$ENV{'database'}$2/;' $NEW |
60 | 60 | perl -pi -e 's/^\s+<LocalHostName>.*?<\/LocalHostName>\n//m;' $NEW |
61 | 61 | |
62 | 62 | mv $NEW /etc/mythtv/config.xml |
diff --git a/deb/debian/mythtv-database.config b/deb/debian/mythtv-database.config
index 0a46a8f..1317c72 100755
a
|
b
|
|
5 | 5 | |
6 | 6 | CONFIG=/etc/mythtv/config.xml |
7 | 7 | if [ -e $CONFIG ]; then |
8 | | db_set mythtv/mysql_mythtv_dbname "`xpath -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" |
9 | | db_set mythtv/mysql_mythtv_user "`xpath -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`" |
10 | | db_set mythtv/mysql_mythtv_password "`xpath -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`" |
11 | | db_set mythtv/mysql_host "`xpath -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`" |
| 8 | if [ "`xpath -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" = "" ]; then |
| 9 | db_set mythtv/mysql_mythtv_dbname "`xpath -q -e 'string(//DatabaseName)' $CONFIG 2>/dev/null`" |
| 10 | db_set mythtv/mysql_mythtv_user "`xpath -q -e 'string(//UserName)' $CONFIG 2>/dev/null`" |
| 11 | db_set mythtv/mysql_mythtv_password "`xpath -q -e 'string(//Password)' $CONFIG 2>/dev/null`" |
| 12 | db_set mythtv/mysql_host "`xpath -q -e 'string(//Host)' $CONFIG 2>/dev/null`" |
| 13 | else |
| 14 | ## This special case can be removed during the 14.10 dev cycle (it's only needed for upgrades from 0.25) |
| 15 | db_set mythtv/mysql_mythtv_dbname "`xpath -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" |
| 16 | db_set mythtv/mysql_mythtv_user "`xpath -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`" |
| 17 | db_set mythtv/mysql_mythtv_password "`xpath -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`" |
| 18 | db_set mythtv/mysql_host "`xpath -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`" |
| 19 | fi |
12 | 20 | fi |
13 | 21 | |
14 | 22 | if which mysql >/dev/null; then |
diff --git a/deb/debian/mythweb.config b/deb/debian/mythweb.config
index 0f1b607..803d5b3 100644
a
|
b
|
|
3 | 3 | |
4 | 4 | CONFIG=/etc/mythtv/config.xml |
5 | 5 | if [ -e $CONFIG ]; then |
6 | | db_set mythtv/mysql_mythtv_dbname "`xpath -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" |
7 | | db_set mythtv/mysql_mythtv_user "`xpath -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`" |
8 | | db_set mythtv/mysql_mythtv_password "`xpath -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`" |
9 | | db_set mythtv/mysql_host "`xpath -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`" |
| 6 | if [ "`xpath -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" = "" ]; then |
| 7 | db_set mythtv/mysql_mythtv_dbname "`xpath -q -e 'string(//DatabaseName)' $CONFIG 2>/dev/null`" |
| 8 | db_set mythtv/mysql_mythtv_user "`xpath -q -e 'string(//UserName)' $CONFIG 2>/dev/null`" |
| 9 | db_set mythtv/mysql_mythtv_password "`xpath -q -e 'string(//Password)' $CONFIG 2>/dev/null`" |
| 10 | db_set mythtv/mysql_host "`xpath -q -e 'string(//Host)' $CONFIG 2>/dev/null`" |
| 11 | else |
| 12 | ## This special case can be removed during the 14.10 dev cycle (it's only needed for upgrades from 0.25) |
| 13 | db_set mythtv/mysql_mythtv_dbname "`xpath -q -e 'string(//DBName)' $CONFIG 2>/dev/null`" |
| 14 | db_set mythtv/mysql_mythtv_user "`xpath -q -e 'string(//DBUserName)' $CONFIG 2>/dev/null`" |
| 15 | db_set mythtv/mysql_mythtv_password "`xpath -q -e 'string(//DBPassword)' $CONFIG 2>/dev/null`" |
| 16 | db_set mythtv/mysql_host "`xpath -q -e 'string(//DBHostName)' $CONFIG 2>/dev/null`" |
| 17 | fi |
10 | 18 | fi |
11 | 19 | |
12 | 20 | MYTHWEB_CONFIG=/etc/default/mythweb |