From 8b1b7e27646806c6b283f93a62fd59ed6083f97e Mon Sep 17 00:00:00 2001 From: jim-p Date: Thu, 12 Feb 2015 09:56:21 -0500 Subject: Fixup config path for lcdproc on 2.2 --- config/lcdproc-dev/lcdproc.inc | 7 ++++++- config/lcdproc/lcdproc.inc | 7 ++++++- pkg_config.10.xml | 4 ++-- pkg_config.8.xml | 4 ++-- pkg_config.8.xml.amd64 | 4 ++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index 73827721..fed2e7dc 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -32,7 +32,12 @@ require_once("service-utils.inc"); /* LCDproc */ define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh'); - define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf'); + $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); + if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) { + define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf'); + } else { + define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf'); + } define('LCDPROC_HOST','localhost'); define('LCDPROC_PORT','13666'); define('LCDPROC_SERVICE_NAME','lcdproc'); diff --git a/config/lcdproc/lcdproc.inc b/config/lcdproc/lcdproc.inc index 760732df..321328bc 100644 --- a/config/lcdproc/lcdproc.inc +++ b/config/lcdproc/lcdproc.inc @@ -33,7 +33,12 @@ /* LCDproc */ define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh'); define('LCDPROC_CLIENT', '/tmp/lcdclient.sh'); - define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf'); + $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); + if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) { + define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf'); + } else { + define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf'); + } define('LCDPROC_HOST','localhost'); define('LCDPROC_PORT','13666'); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 49344495..1ad51ac9 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -912,7 +912,7 @@ LCD display driver http://www.lcdproc.org/ Utility - lcdproc-0.5.7_2 pkg.v.1.0.1 + lcdproc-0.5.7_2 pkg.v.1.0.2 BETA 2.2 seth.mos@dds.nl @@ -930,7 +930,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.7_2 pkg v. 0.9.10 + lcdproc-0.5.7_2 pkg v. 0.9.11 BETA 2.2 michele@nt2.it diff --git a/pkg_config.8.xml b/pkg_config.8.xml index b98fe248..ad08641e 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1211,7 +1211,7 @@ LCD display driver http://www.lcdproc.org/ Utility - lcdproc-0.5.5 pkg.v.1.0.1 + lcdproc-0.5.5 pkg.v.1.0.2 BETA 1.2.1 seth.mos@dds.nl @@ -1229,7 +1229,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.10 + lcdproc-0.5.6 pkg v. 0.9.11 BETA 2.0 michele@nt2.it diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index d914a59e..37bdfe12 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1198,7 +1198,7 @@ LCD display driver http://www.lcdproc.org/ Utility - lcdproc-0.5.5 pkg.v.1.0.1 + lcdproc-0.5.5 pkg.v.1.0.2 BETA 1.2.1 seth.mos@dds.nl @@ -1216,7 +1216,7 @@ LCD display driver - Development version http://www.lcdproc.org/ Utility - lcdproc-0.5.6 pkg v. 0.9.10 + lcdproc-0.5.6 pkg v. 0.9.11 BETA 2.0 michele@nt2.it -- cgit v1.2.3