fix test in rc scripts; thanks to Ville Aakko on closed bug #149559

Package-Manager: portage-2.1.1

4 files changed, 31 insertions, 23 deletions

diff --git a/media-plugins/vdr-skinsoppalusikka/ChangeLog b/media-plugins/vdr-skinsoppalusikka/ChangeLog
index d5b7261e011e..fb83379ea386 100644
--- a/media-plugins/vdr-skinsoppalusikka/ChangeLog
+++ b/media-plugins/vdr-skinsoppalusikka/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-skinsoppalusikka
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinsoppalusikka/ChangeLog,v 1.20 2006/09/18 20:12:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinsoppalusikka/ChangeLog,v 1.21 2006/09/29 21:51:58 hd_brummy Exp $
+
+  29 Sep 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  files/rc-addon-1.0.1.sh, files/rc-addon-1.0.2.sh:
+  fix test in rc scripts; thanks to Ville Aakko on closed bug #149559
 
 *vdr-skinsoppalusikka-1.0.2 (18 Sep 2006)
 
diff --git a/media-plugins/vdr-skinsoppalusikka/Manifest b/media-plugins/vdr-skinsoppalusikka/Manifest
index 84945fc13bef..af5bf96ca908 100644
--- a/media-plugins/vdr-skinsoppalusikka/Manifest
+++ b/media-plugins/vdr-skinsoppalusikka/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX rc-addon-1.0.1.sh 674 RMD160 d154177413865a43aae4b369a205f52a35ea8372 SHA1 02566e691a6d8538065cb125ad5ef7c29f879d93 SHA256 a0b0d26839927c6cbece545bd4c908de1d10d3951d45f7a93a34fae305c1c751
-MD5 4bc4f965edd3f585032e45a40a3dc6be files/rc-addon-1.0.1.sh 674
-RMD160 d154177413865a43aae4b369a205f52a35ea8372 files/rc-addon-1.0.1.sh 674
-SHA256 a0b0d26839927c6cbece545bd4c908de1d10d3951d45f7a93a34fae305c1c751 files/rc-addon-1.0.1.sh 674
-AUX rc-addon-1.0.2.sh 665 RMD160 3d2d52f0cdbe552fe48e5a3c8c509502bade3600 SHA1 4fce4a7b37bcbc821bafece48b55e19cb3569058 SHA256 d4efd6217c15d90093ba78bbbedee64b2c5a73abd88f7eeebe3775e07cdbdcf7
-MD5 9242cdd5fb636d9d6c74b26074b4458c files/rc-addon-1.0.2.sh 665
-RMD160 3d2d52f0cdbe552fe48e5a3c8c509502bade3600 files/rc-addon-1.0.2.sh 665
-SHA256 d4efd6217c15d90093ba78bbbedee64b2c5a73abd88f7eeebe3775e07cdbdcf7 files/rc-addon-1.0.2.sh 665
+AUX rc-addon-1.0.1.sh 725 RMD160 18d51d238505a194c595e8b0ddaccf93541f3b17 SHA1 e7890b5c70af4c6a9c9fb135574bb9df8b5fe63b SHA256 072d6c50ec73510983b64651c2611c24b0e765266da0bb161f549e43ab684648
+MD5 09a20fc668087c9f9fd42b0cb450a739 files/rc-addon-1.0.1.sh 725
+RMD160 18d51d238505a194c595e8b0ddaccf93541f3b17 files/rc-addon-1.0.1.sh 725
+SHA256 072d6c50ec73510983b64651c2611c24b0e765266da0bb161f549e43ab684648 files/rc-addon-1.0.1.sh 725
+AUX rc-addon-1.0.2.sh 715 RMD160 f994eb721d6202dc7687a060452b0c3b60ece2e9 SHA1 94324556e484270e2345afcf913db1f0fb4f48f0 SHA256 fca8616b57755d9b16c96c33e13016bc0009d50a57dc2a1e8ce73e400a5cbaae
+MD5 4f3771182d71d8ce1f5581a1a9603ccb files/rc-addon-1.0.2.sh 715
+RMD160 f994eb721d6202dc7687a060452b0c3b60ece2e9 files/rc-addon-1.0.2.sh 715
+SHA256 fca8616b57755d9b16c96c33e13016bc0009d50a57dc2a1e8ce73e400a5cbaae files/rc-addon-1.0.2.sh 715
 AUX rc-addon.sh 439 RMD160 f04e2486e388dbaad7ed6045b393485551a5511c SHA1 9f78a6ec1427dc38230a57291e39a2ed018afc7b SHA256 852dee968e256fe7a28a4926faf1ed17c7ce1c64c6ab44c92919551105abfb1d
 MD5 1777a75c9e17f95cec09fd878e009e02 files/rc-addon.sh 439
 RMD160 f04e2486e388dbaad7ed6045b393485551a5511c files/rc-addon.sh 439
@@ -64,10 +64,10 @@ EBUILD vdr-skinsoppalusikka-1.0.2.ebuild 885 RMD160 68c4183d3fb10a71963113233728
 MD5 6a7e044b84743e07f921bd85d8d2651e vdr-skinsoppalusikka-1.0.2.ebuild 885
 RMD160 68c4183d3fb10a71963113233728a2d83bac6de7 vdr-skinsoppalusikka-1.0.2.ebuild 885
 SHA256 4c77e15c5b9ad671d7a97f36263279d6ca4d3573e94f0fb62a5725a4aa37e355 vdr-skinsoppalusikka-1.0.2.ebuild 885
-MISC ChangeLog 4255 RMD160 6295fe3afc877e4f3a25dc211c2a0a71a8d5e350 SHA1 d573c4db5828195e7cbddc8b4ccce4e2e684ca19 SHA256 0c269a3c521381cfa4bf95248e6504e489cfc7c4266ed7dca573b66ebc206d5d
-MD5 29ed04372cc8ce15daba2292ca8d0166 ChangeLog 4255
-RMD160 6295fe3afc877e4f3a25dc211c2a0a71a8d5e350 ChangeLog 4255
-SHA256 0c269a3c521381cfa4bf95248e6504e489cfc7c4266ed7dca573b66ebc206d5d ChangeLog 4255
+MISC ChangeLog 4433 RMD160 0fc2b5f062915f349dde20e2e6d7eae167e4a785 SHA1 058a4d68842de99dad510354ff93e7eacf321174 SHA256 ace2fb3f4d50be130d7b9121acc0cb84c63361c9442600599cbfbc5324d6fc1d
+MD5 b29f8ed2bc247832a2c0a05faa90666d ChangeLog 4433
+RMD160 0fc2b5f062915f349dde20e2e6d7eae167e4a785 ChangeLog 4433
+SHA256 ace2fb3f4d50be130d7b9121acc0cb84c63361c9442600599cbfbc5324d6fc1d ChangeLog 4433
 MISC metadata.xml 385 RMD160 5402b50a5d2d42b59c9dddde0c7e9bbb1de0995e SHA1 8035b846ec5ffc6a75e2d7fbbed2cac3e9cf0814 SHA256 d33711c20cf70540856eef5e8811923f2455861c84a525ca9b0830117dcfde94
 MD5 be4d1c50caf6cd019eb8e782b73e0e06 metadata.xml 385
 RMD160 5402b50a5d2d42b59c9dddde0c7e9bbb1de0995e metadata.xml 385
@@ -94,10 +94,10 @@ MD5 253ade5f427415020f716c13299de177 files/digest-vdr-skinsoppalusikka-1.0.2 268
 RMD160 6bedaf747b6576bfa080cea9186abfe5aacf331f files/digest-vdr-skinsoppalusikka-1.0.2 268
 SHA256 66ce4efd203e95aa3404f6f6c4d63dabd3ec8f92b8df06fc7f36807d8b6da826 files/digest-vdr-skinsoppalusikka-1.0.2 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: no further Information
 
-iD8DBQFFDv3Hdn07HTTCgIoRApyxAJkB76FCYN3AmFk62JZUwWo3L/LyvwCgi0t3
-gaTzbFUdcj8Vtfxbke5Gqg4=
-=8he/
+iD8DBQFFHZXDdn07HTTCgIoRAuydAKCpRNhFiWy0qmkoSrtayqGu8oc6SgCfa+Ts
+8lbpPvZ4fb6PxLM9JHFznO4=
+=P5+s
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.1.sh b/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.1.sh
index f0f5597c1ace..1ce8105a0a65 100644
--- a/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.1.sh
+++ b/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.1.sh
@@ -1,13 +1,15 @@
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.1.sh,v 1.2 2006/09/18 20:12:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.1.sh,v 1.3 2006/09/29 21:51:58 hd_brummy Exp $
 #
 # rc-addon plugin-startup-skript for vdr-skinsoppalusikka
 #
 # This sript is called by gentoo-vdr-scripts on start of VDR
 
-# Check on dxr-3 and set default logo DIR
+# Check if dxr3 plugin in /etc/conf.d/vdr Plugins="" 
+# and set default logo DIR
+
 plugin_pre_vdr_start() {
 
-	if [[ -z ${PLUGINS/dxr3/} ]] ; then
+	if [[ ${PLUGINS} != ${PLUGINS/dxr3/} ]] ; then
 		: ${SKINSOPPALUSIKKA_LOGOS_DIR:=/usr/share/vdr/skinsoppalusikka/logos-dxr3}
 	else
 		: ${SKINSOPPALUSIKKA_LOGOS_DIR:=/usr/share/vdr/skinsoppalusikka/logos}
diff --git a/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.2.sh b/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.2.sh
index 23f1fd4f91f0..314c37cd5856 100644
--- a/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.2.sh
+++ b/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.2.sh
@@ -1,13 +1,15 @@
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.2.sh,v 1.1 2006/09/18 20:12:38 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinsoppalusikka/files/rc-addon-1.0.2.sh,v 1.2 2006/09/29 21:51:58 hd_brummy Exp $
 #
 # rc-addon plugin-startup-skript for vdr-skinsoppalusikka
 #
 # This sript is called by gentoo-vdr-scripts on start of VDR
 
-# Check on dxr-3 and set default logo DIR
+# Check if dxr3 plugin in /etc/conf.d/vdr Plugins=""
+# and set default logo DIR
+
 plugin_pre_vdr_start() {
 
-	if [[ -z ${PLUGINS/dxr3/} ]] ; then
+	if [[ ${PLUGINS} != ${PLUGINS/dxr3/} ]] ; then
 		: ${SKINSOPPALUSIKKA_LOGOS_DIR:=/usr/share/vdr/skinsoppalusikka/logos-dxr3}
 	else
 		: ${SKINSOPPALUSIKKA_LOGOS_DIR:=/usr/share/vdr/channel-logos}