/[gentoo-x86]/eclass/vdr-plugin.eclass
Gentoo

Diff of /eclass/vdr-plugin.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.36 Revision 1.49
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/vdr-plugin.eclass,v 1.36 2006/10/12 16:31:45 zzam Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/vdr-plugin.eclass,v 1.49 2007/08/16 17:59:21 zzam Exp $
4# 4#
5# Author: 5# Author:
6# Matthias Schwarzott <zzam@gentoo.org> 6# Matthias Schwarzott <zzam@gentoo.org>
7# Joerg Bornkessel <hd_brummy@gentoo.org> 7# Joerg Bornkessel <hd_brummy@gentoo.org>
8 8
58# all patches which ending on diff or patch in this DIR will automatically applied 58# all patches which ending on diff or patch in this DIR will automatically applied
59# 59#
60 60
61inherit base multilib eutils flag-o-matic 61inherit base multilib eutils flag-o-matic
62 62
63IUSE="debug" 63IUSE=""
64 64
65# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes 65# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes
66VDRPLUGIN="${PN/#vdrplugin-/}" 66VDRPLUGIN="${PN/#vdrplugin-/}"
67VDRPLUGIN="${VDRPLUGIN/#vdr-/}" 67VDRPLUGIN="${VDRPLUGIN/#vdr-/}"
68VDRPLUGIN="${VDRPLUGIN/%-cvs/}" 68VDRPLUGIN="${VDRPLUGIN/%-cvs/}"
98 einfo "Removing ${CATEGORY}/${PN}-${PVR} from vdrplugindb." 98 einfo "Removing ${CATEGORY}/${PN}-${PVR} from vdrplugindb."
99 sed -ie "/.*${CATEGORY}\/${P}.*/d" ${VDRPLUGINDB_DIR}/vdrplugindb 99 sed -ie "/.*${CATEGORY}\/${P}.*/d" ${VDRPLUGINDB_DIR}/vdrplugindb
100 fi 100 fi
101} 101}
102 102
103# New method of storing plugindb
104# Called from src_install
105# file maintained by normal portage-methods
106create_plugindb_file() {
107 local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
108 local DB_FILE=${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}
109 insinto ${NEW_VDRPLUGINDB_DIR}
110 cat <<-EOT > ${D}/${DB_FILE}
111 VDRPLUGIN_DB=1
112 CREATOR=ECLASS
113 EBUILD=${CATEGORY}/${PN}
114 EBUILD_V=${PVR}
115 EOT
116}
117
118# Delete files created outside of vdr-plugin.eclass
119# vdrplugin-rebuild.ebuild converted plugindb and files are
120# not deleted by portage itself - should only be needed as
121# long as not every system has switched over to
122# vdrplugin-rebuild-0.2
123delete_orphan_plugindb_file() {
124 #elog Testing for orphaned plugindb file
125 local NEW_VDRPLUGINDB_DIR=/usr/share/vdr/vdrplugin-rebuild/
126 local DB_FILE=${ROOT}/${NEW_VDRPLUGINDB_DIR}/${CATEGORY}-${PF}
127
128 # file exists
129 [[ -f ${DB_FILE} ]] || return
130
131 # will portage handle the file itself
132 if grep -q CREATOR=ECLASS ${DB_FILE}; then
133 #elog file owned by eclass - don't touch it
134 return
135 fi
136
137 elog "Removing orphaned plugindb-file."
138 elog "\t#rm ${DB_FILE}"
139 rm ${DB_FILE}
140}
141
142
143create_header_checksum_file()
144{
145 # Danger: Not using $ROOT here, as compile will also not use it !!!
146 # If vdr in $ROOT and / differ, plugins will not run anyway
147
148 insinto ${VDR_CHECKSUM_DIR}
149 if [[ -f ${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then
150 newins ${VDR_CHECKSUM_DIR}/header-md5-vdr header-md5-${PN}
151 else
152 if type -p md5sum >/dev/null 2>&1; then
153 cd ${S}
154 (
155 cd ${VDR_INCLUDE_DIR}
156 md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
157 ) > header-md5-${PN}
158 doins header-md5-${PN}
159 fi
160 fi
161}
162
103vdr-plugin_pkg_setup() { 163vdr-plugin_pkg_setup() {
104 # -fPIC is needed for shared objects on some platforms (amd64 and others) 164 # -fPIC is needed for shared objects on some platforms (amd64 and others)
105 append-flags -fPIC 165 append-flags -fPIC
106 use debug && append-flags -g
107 166
108 # Where should the plugins live in the filesystem 167 # Where should the plugins live in the filesystem
109 VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins" 168 VDR_PLUGIN_DIR="/usr/$(get_libdir)/vdr/plugins"
110 VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums" 169 VDR_CHECKSUM_DIR="${VDR_PLUGIN_DIR%/plugins}/checksums"
111 170
115 174
116 # Pathes to includes 175 # Pathes to includes
117 VDR_INCLUDE_DIR="/usr/include/vdr" 176 VDR_INCLUDE_DIR="/usr/include/vdr"
118 DVB_INCLUDE_DIR="/usr/include" 177 DVB_INCLUDE_DIR="/usr/include"
119 178
179
180 TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
181 LOCDIR="/usr/share/vdr/locale"
182 if has_version ">=media-video/vdr-1.5.7"; then
183 USE_GETTEXT=1
184 else
185 USE_GETTEXT=0
186 fi
120 187
121 VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/config.h) 188 VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/config.h)
122 APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/config.h) 189 APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' ${VDR_INCLUDE_DIR}/config.h)
123 [[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}" 190 [[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}"
124 191
132 eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin_pkg_setup." 199 eerror "An ebuild for a vdr-plugin will not work without calling vdr-plugin_pkg_setup."
133 echo 200 echo
134 eerror "Please report this at bugs.gentoo.org." 201 eerror "Please report this at bugs.gentoo.org."
135 die "vdr-plugin_pkg_setup not called!" 202 die "vdr-plugin_pkg_setup not called!"
136 fi 203 fi
137 [ -z "$1" ] && vdr-plugin_src_unpack unpack add_local_patch patchmakefile 204 [ -z "$1" ] && vdr-plugin_src_unpack unpack add_local_patch patchmakefile i18n
138 205
139 while [ "$1" ]; do 206 while [ "$1" ]; do
140 207
141 case "$1" in 208 case "$1" in
142 all_but_unpack) 209 all_but_unpack)
143 vdr-plugin_src_unpack add_local_patch patchmakefile 210 vdr-plugin_src_unpack add_local_patch patchmakefile i18n
144 ;; 211 ;;
145 unpack) 212 unpack)
146 base_src_unpack 213 base_src_unpack
147 ;; 214 ;;
148 patchmakefile) 215 patchmakefile)
149 if ! cd ${S}; then 216 if ! cd ${S}; then
150 ewarn "There seems to be no plugin-directory with the name ${S##*/}" 217 ewarn "There seems to be no plugin-directory with the name ${S##*/}"
151 ewarn "Perhaps you find one among these:" 218 ewarn "Perhaps you find one among these:"
152 cd "${WORKDIR}" 219 cd "${WORKDIR}"
153 einfo "$(/bin/ls -1 ${WORKDIR})" 220 ewarn "$(/bin/ls -1 ${WORKDIR})"
154 die "Could not change to plugin-source-directory!" 221 die "Could not change to plugin-source-directory!"
155 fi 222 fi
156 223
157 einfo "Patching Makefile" 224 einfo "Patching Makefile"
158 [[ -e Makefile ]] || die "Makefile of plugin can not be found!" 225 [[ -e Makefile ]] || die "Makefile of plugin can not be found!"
159 cp Makefile Makefile.orig 226 cp Makefile "${WORKDIR}"/Makefile.before
160 227
161 sed -i Makefile \ 228 sed -i Makefile \
162 -e '1i\#Makefile was patched by vdr-plugin.eclass' 229 -e '1i\#Makefile was patched by vdr-plugin.eclass'
163 230
164 ebegin " Setting Pathes" 231 ebegin " Setting Pathes"
177 -e 's:^APIVERSION = :APIVERSION ?= :' \ 244 -e 's:^APIVERSION = :APIVERSION ?= :' \
178 -e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \ 245 -e 's:$(LIBDIR)/$@.$(VDRVERSION):$(LIBDIR)/$@.$(APIVERSION):' \
179 -e '2i\APIVERSION = '"${APIVERSION}" 246 -e '2i\APIVERSION = '"${APIVERSION}"
180 eend $? 247 eend $?
181 248
182 ebegin " Correcting CXXFLAGS" 249 ebegin " Correcting Compile-Flags"
183 sed -i Makefile \ 250 sed -i Makefile \
184 -e 's:^CXXFLAGS:#CXXFLAGS:' 251 -e 's:^CXXFLAGS:#CXXFLAGS:' \
252 -e '/LDFLAGS/!s:-shared:$(LDFLAGS) -shared:'
185 eend $? 253 eend $?
186 254
187 ebegin " Disabling file stripping" 255 ebegin " Disabling file stripping"
188 sed -i Makefile \ 256 sed -i Makefile \
189 -e '/@.*strip/d' \ 257 -e '/@.*strip/d' \
204 for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PN}/${PV}/*.{diff,patch}; do 272 for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PN}/${PV}/*.{diff,patch}; do
205 test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}" 273 test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
206 done 274 done
207 fi 275 fi
208 ;; 276 ;;
277 i18n)
278 cd ${S}
279 if [[ ${USE_GETTEXT} = 0 ]]; then
280 # Remove i18n Target if using older vdr
281 sed -i Makefile \
282 -e '/^all:/s/ i18n//'
283 elif [[ ${USE_GETTEXT} = 1 && ! -d po && ${NO_GETTEXT_HACK} != 1 ]]; then
284 einfo "Converting translations to gettext"
285
286 local i18n_tool=/usr/share/vdr/bin/i18n-to-gettext.pl
287 if [[ ! -x ${i18n_tool} ]]; then
288 eerror "Missing ${i18n_tool}"
289 eerror "Please re-emerge vdr"
290 die "Missing ${i18n_tool}"
291 fi
292
293 # call i18n-to-gettext tool
294 # take all texts missing tr call into special file
295 ${i18n_tool} 2>/dev/null \
296 |sed -e '/^"/!d' \
297 -e '/^""$/d' \
298 -e 's/\(.*\)/trNOOP(\1)/' \
299 > dummy-translations-trNOOP.c
300
301 # if there were untranslated texts just run it again
302 # now the missing calls are listed in
303 # dummy-translations-trNOOP.c
304 if [[ -s dummy-translations-trNOOP.c ]]; then
305 ${i18n_tool} &>/dev/null
306 fi
307
308 # now use the modified Makefile
309 mv Makefile.new Makefile
310 fi
209 esac 311 esac
210 312
211 shift 313 shift
212 done 314 done
213} 315}
214 316
215vdr-plugin_copy_source_tree() { 317vdr-plugin_copy_source_tree() {
216 pushd . >/dev/null 318 pushd . >/dev/null
217 cp -r ${S} ${T}/source-tree 319 cp -r ${S} ${T}/source-tree
218 cd ${T}/source-tree 320 cd ${T}/source-tree
219 mv Makefile.orig Makefile 321 cp "${WORKDIR}"/Makefile.before Makefile
220 sed -i Makefile \ 322 sed -i Makefile \
221 -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \ 323 -e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
222 -e 's:^CXXFLAGS:#CXXFLAGS:' \ 324 -e 's:^CXXFLAGS:#CXXFLAGS:' \
223 -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \ 325 -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
224 -e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):' 326 -e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
252 eerror "Please report this at bugs.gentoo.org." 354 eerror "Please report this at bugs.gentoo.org."
253 die "vdr-plugin_src_unpack not called!" 355 die "vdr-plugin_src_unpack not called!"
254 fi 356 fi
255 cd ${S} 357 cd ${S}
256 358
257 emake ${BUILD_PARAMS} ${VDRPLUGIN_MAKE_TARGET:-all} || die "emake failed" 359 emake ${BUILD_PARAMS} \
360 ${VDRPLUGIN_MAKE_TARGET:-all} \
361 LOCALEDIR="${TMP_LOCALE_DIR}" \
362 || die "emake failed"
258 ;; 363 ;;
259 esac 364 esac
260 365
261 shift 366 shift
262 done 367 done
263} 368}
264 369
265vdr-plugin_src_install() { 370vdr-plugin_src_install() {
266 [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin_install_source_tree 371 [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin_install_source_tree
267 cd ${S} 372 cd "${WORKDIR}"
268 373
269 if [[ -n ${VDR_MAINTAINER_MODE} ]]; then 374 if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
270 local mname=${P}-Makefile 375 local mname=${P}-Makefile
271 cp Makefile ${mname}.patched 376 cp "${S}"/Makefile ${mname}.patched
272 cp Makefile.orig ${mname}.before 377 cp Makefile.before ${mname}.before
273 378
274 diff -u ${mname}.before ${mname}.patched > ${mname}.diff 379 diff -u ${mname}.before ${mname}.patched > ${mname}.diff
275 380
276 insinto "/usr/share/vdr/maintainer-data/makefile-changes" 381 insinto "/usr/share/vdr/maintainer-data/makefile-changes"
277 doins ${mname}.diff 382 doins ${mname}.diff
282 insinto "/usr/share/vdr/maintainer-data/makefile-patched" 387 insinto "/usr/share/vdr/maintainer-data/makefile-patched"
283 doins ${mname}.patched 388 doins ${mname}.patched
284 389
285 fi 390 fi
286 391
392 cd "${S}"
287 insinto "${VDR_PLUGIN_DIR}" 393 insinto "${VDR_PLUGIN_DIR}"
288 doins libvdr-*.so.* 394 doins libvdr-*.so.*
395
396 if [[ ${USE_GETTEXT} = 1 && -d ${TMP_LOCALE_DIR} ]]; then
397 einfo "Installing locales"
398 cd "${TMP_LOCALE_DIR}"
399 insinto "${LOCDIR}"
400 doins -r *
401 fi
402
403 cd "${S}"
289 local docfile 404 local docfile
290 for docfile in README* HISTORY CHANGELOG; do 405 for docfile in README* HISTORY CHANGELOG; do
291 [[ -f ${docfile} ]] && dodoc ${docfile} 406 [[ -f ${docfile} ]] && dodoc ${docfile}
292 done 407 done
293 408
294 # if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it 409 # if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it
295 [[ -z ${VDR_CONFD_FILE} ]] && [[ -e ${FILESDIR}/confd ]] && VDR_CONFD_FILE=${FILESDIR}/confd 410 [[ -z ${VDR_CONFD_FILE} ]] && [[ -e ${FILESDIR}/confd ]] && VDR_CONFD_FILE=${FILESDIR}/confd
296 411
297 if [[ -n ${VDR_CONFD_FILE} ]]; then 412 if [[ -n ${VDR_CONFD_FILE} ]]; then
298 insinto /etc/conf.d
299 newins "${VDR_CONFD_FILE}" vdr.${VDRPLUGIN} 413 newconfd "${VDR_CONFD_FILE}" vdr.${VDRPLUGIN}
300 fi 414 fi
301 415
302 416
303 # if VDR_RCADDON_FILE is empty and ${FILESDIR}/rc-addon.sh exists take it 417 # if VDR_RCADDON_FILE is empty and ${FILESDIR}/rc-addon.sh exists take it
304 [[ -z ${VDR_RCADDON_FILE} ]] && [[ -e ${FILESDIR}/rc-addon.sh ]] && VDR_RCADDON_FILE=${FILESDIR}/rc-addon.sh 418 [[ -z ${VDR_RCADDON_FILE} ]] && [[ -e ${FILESDIR}/rc-addon.sh ]] && VDR_RCADDON_FILE=${FILESDIR}/rc-addon.sh
306 if [[ -n ${VDR_RCADDON_FILE} ]]; then 420 if [[ -n ${VDR_RCADDON_FILE} ]]; then
307 insinto "${VDR_RC_DIR}" 421 insinto "${VDR_RC_DIR}"
308 newins "${VDR_RCADDON_FILE}" plugin-${VDRPLUGIN}.sh 422 newins "${VDR_RCADDON_FILE}" plugin-${VDRPLUGIN}.sh
309 fi 423 fi
310 424
311 425 create_header_checksum_file
312 426 create_plugindb_file
313 insinto ${VDR_CHECKSUM_DIR}
314 if [[ -f ${ROOT}${VDR_CHECKSUM_DIR}/header-md5-vdr ]]; then
315 newins ${ROOT}${VDR_CHECKSUM_DIR}/header-md5-vdr header-md5-${PN}
316 else
317 if which md5sum >/dev/null 2>&1; then
318 cd ${S}
319 (
320 cd ${ROOT}${VDR_INCLUDE_DIR}
321 md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
322 ) > header-md5-${PN}
323 doins header-md5-${PN}
324 fi
325 fi
326} 427}
327 428
328vdr-plugin_pkg_postinst() { 429vdr-plugin_pkg_postinst() {
430 if has_version "<=media-tv/vdrplugin-rebuild-0.1"; then
329 update_vdrplugindb 431 update_vdrplugindb
330 einfo 432 fi
433 elog
331 einfo "The vdr plugin ${VDRPLUGIN} has now been installed." 434 elog "The vdr plugin ${VDRPLUGIN} has now been installed."
332 einfo "To activate execute the following command:" 435 elog "To activate execute the following command:"
333 einfo 436 elog
334 einfo " emerge --config ${PN}" 437 elog " emerge --config ${PN}"
335 einfo 438 elog
336 if [[ -n "${VDR_CONFD_FILE}" ]]; then 439 if [[ -n "${VDR_CONFD_FILE}" ]]; then
337 einfo "And have a look at the config-file" 440 elog "And have a look at the config-file"
338 einfo "/etc/conf.d/vdr.${VDRPLUGIN}" 441 elog "/etc/conf.d/vdr.${VDRPLUGIN}"
339 einfo 442 elog
340 fi 443 fi
341} 444}
342 445
343vdr-plugin_pkg_postrm() { 446vdr-plugin_pkg_postrm() {
447 if has_version "<=media-tv/vdrplugin-rebuild-0.1"; then
344 remove_vdrplugindb 448 remove_vdrplugindb
449 fi
450 delete_orphan_plugindb_file
345} 451}
346 452
347vdr-plugin_pkg_config_final() { 453vdr-plugin_pkg_config_final() {
348 diff ${conf_orig} ${conf} 454 diff ${conf_orig} ${conf}
349 rm ${conf_orig} 455 rm ${conf_orig}
350} 456}
351 457
352vdr-plugin_pkg_config_old() { 458vdr-plugin_pkg_config_old() {
353 einfo "Using interface of gentoo-vdr-scripts-0.3.6 and older" 459 elog "Using interface of gentoo-vdr-scripts-0.3.6 and older"
354 if [[ -z "${INSTALLPLUGIN}" ]]; then 460 if [[ -z "${INSTALLPLUGIN}" ]]; then
355 INSTALLPLUGIN="${VDRPLUGIN}" 461 INSTALLPLUGIN="${VDRPLUGIN}"
356 fi 462 fi
357 # First test if plugin is already inside PLUGINS 463 # First test if plugin is already inside PLUGINS
358 local conf=/etc/conf.d/vdr 464 local conf=/etc/conf.d/vdr
359 conf_orig=${conf}.before_emerge_config 465 conf_orig=${conf}.before_emerge_config
360 cp ${conf} ${conf_orig} 466 cp ${conf} ${conf_orig}
361 467
362 einfo "Reading ${conf}" 468 elog "Reading ${conf}"
363 if ! grep -q "^PLUGINS=" ${conf}; then 469 if ! grep -q "^PLUGINS=" ${conf}; then
364 local LINE=$(sed ${conf} -n -e '/^#.*PLUGINS=/=' | tail -n 1) 470 local LINE=$(sed ${conf} -n -e '/^#.*PLUGINS=/=' | tail -n 1)
365 if [[ -n "${LINE}" ]]; then 471 if [[ -n "${LINE}" ]]; then
366 sed -e ${LINE}'a PLUGINS=""' -i ${conf} 472 sed -e ${LINE}'a PLUGINS=""' -i ${conf}
367 else 473 else
380 break; 486 break;
381 fi 487 fi
382 done 488 done
383 489
384 if [[ "${active}" == "1" ]]; then 490 if [[ "${active}" == "1" ]]; then
385 einfo "${INSTALLPLUGIN} already activated" 491 elog "${INSTALLPLUGIN} already activated"
386 echo 492 echo
387 read -p "Do you want to deactivate ${INSTALLPLUGIN} (yes/no) " answer 493 read -p "Do you want to deactivate ${INSTALLPLUGIN} (yes/no) " answer
388 if [[ "${answer}" != "yes" ]]; then 494 if [[ "${answer}" != "yes" ]]; then
389 einfo "aborted" 495 elog "aborted"
390 return 496 return
391 fi 497 fi
392 einfo "Removing ${INSTALLPLUGIN} from active plugins." 498 elog "Removing ${INSTALLPLUGIN} from active plugins."
393 local LINE=$(sed ${conf} -n -e '/^PLUGINS=.*\<'${INSTALLPLUGIN}'\>/=' | tail -n 1) 499 local LINE=$(sed ${conf} -n -e '/^PLUGINS=.*\<'${INSTALLPLUGIN}'\>/=' | tail -n 1)
394 sed -i ${conf} -e ${LINE}'s/\<'${INSTALLPLUGIN}'\>//' \ 500 sed -i ${conf} -e ${LINE}'s/\<'${INSTALLPLUGIN}'\>//' \
395 -e ${LINE}'s/ \( \)*/ /g' \ 501 -e ${LINE}'s/ \( \)*/ /g' \
396 -e ${LINE}'s/ "/"/g' \ 502 -e ${LINE}'s/ "/"/g' \
397 -e ${LINE}'s/" /"/g' 503 -e ${LINE}'s/" /"/g'
399 vdr-plugin_pkg_config_final 505 vdr-plugin_pkg_config_final
400 return 506 return
401 fi 507 fi
402 508
403 509
404 einfo "Adding ${INSTALLPLUGIN} to active plugins." 510 elog "Adding ${INSTALLPLUGIN} to active plugins."
405 local LINE=$(sed ${conf} -n -e '/^PLUGINS=/=' | tail -n 1) 511 local LINE=$(sed ${conf} -n -e '/^PLUGINS=/=' | tail -n 1)
406 sed -i ${conf} -e ${LINE}'s/^PLUGINS=" *\(.*\)"/PLUGINS="\1 '${INSTALLPLUGIN}'"/' \ 512 sed -i ${conf} -e ${LINE}'s/^PLUGINS=" *\(.*\)"/PLUGINS="\1 '${INSTALLPLUGIN}'"/' \
407 -e ${LINE}'s/ \( \)*/ /g' \ 513 -e ${LINE}'s/ \( \)*/ /g' \
408 -e ${LINE}'s/ "/"/g' \ 514 -e ${LINE}'s/ "/"/g' \
409 -e ${LINE}'s/" /"/g' 515 -e ${LINE}'s/" /"/g'
410 516
411 vdr-plugin_pkg_config_final 517 vdr-plugin_pkg_config_final
412} 518}
413 519
414vdr-plugin_pkg_config_new() { 520vdr-plugin_pkg_config_new() {
415 einfo "Using interface introduced with gentoo-vdr-scripts-0.3.7" 521 elog "Using interface introduced with gentoo-vdr-scripts-0.3.7"
416 if [[ -z "${INSTALLPLUGIN}" ]]; then 522 if [[ -z "${INSTALLPLUGIN}" ]]; then
417 INSTALLPLUGIN="${VDRPLUGIN}" 523 INSTALLPLUGIN="${VDRPLUGIN}"
418 fi 524 fi
419 525
420 active=0 526 active=0
428 [[ ${1} == ${INSTALLPLUGIN} ]] && active=1 534 [[ ${1} == ${INSTALLPLUGIN} ]] && active=1
429 done 535 done
430 exec 3<&- 536 exec 3<&-
431 537
432 if [[ $active == 0 ]]; then 538 if [[ $active == 0 ]]; then
433 einfo "Adding ${INSTALLPLUGIN} to active plugins." 539 elog "Adding ${INSTALLPLUGIN} to active plugins."
434 540
435 # The pure edit process. 541 # The pure edit process.
436 echo "${INSTALLPLUGIN}" >> "${conf}" 542 echo "${INSTALLPLUGIN}" >> "${conf}"
437 else 543 else
438 einfo "${INSTALLPLUGIN} already activated" 544 elog "${INSTALLPLUGIN} already activated"
439 echo 545 echo
440 read -p "Do you want to deactivate ${INSTALLPLUGIN} (yes/no) " answer 546 read -p "Do you want to deactivate ${INSTALLPLUGIN} (yes/no) " answer
441 if [[ "${answer}" != "yes" ]]; then 547 if [[ "${answer}" != "yes" ]]; then
442 einfo "aborted" 548 elog "aborted"
443 return 549 return
444 fi 550 fi
445 einfo "Removing ${INSTALLPLUGIN} from active plugins." 551 elog "Removing ${INSTALLPLUGIN} from active plugins."
446 552
447 # The pure edit process 553 # The pure edit process
448 sed -i "${conf}" -e "/^[[:space:]]*${INSTALLPLUGIN}[[:space:]]*\$/d" 554 sed -i "${conf}" -e "/^[[:space:]]*${INSTALLPLUGIN}[[:space:]]*\$/d"
449 fi 555 fi
450} 556}

Legend:
Removed from v.1.36  
changed lines
  Added in v.1.49

  ViewVC Help
Powered by ViewVC 1.1.20