diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2006-09-13 21:10:35 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-09-13 21:10:35 +0000 |
commit | 3e63a86748d9b21f51c8226dbcfe307f10eb73a9 (patch) | |
tree | 85879911bddb77801075e9edcd97f7ba98e84670 /media-tv | |
parent | Cleaned up older versions. (diff) | |
download | historical-3e63a86748d9b21f51c8226dbcfe307f10eb73a9.tar.gz historical-3e63a86748d9b21f51c8226dbcfe307f10eb73a9.tar.bz2 historical-3e63a86748d9b21f51c8226dbcfe307f10eb73a9.zip |
Cleaned up older versions.
Package-Manager: portage-2.1.1
Diffstat (limited to 'media-tv')
8 files changed, 7 insertions, 315 deletions
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest index e319b314a3f5..2b894973905e 100644 --- a/media-tv/gentoo-vdr-scripts/Manifest +++ b/media-tv/gentoo-vdr-scripts/Manifest @@ -1,54 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX gentoo-vdr-scripts-0.3.5-merged-file-permissions.diff 336 RMD160 263aad626f433a461504dd698513dd2994734ebb SHA1 4ac8d764bac7c7fcbe0b998ca79c294a180c3070 SHA256 1262ef2aaccd6e5a82c45f9a93d2aba9aa7c07dc96ed05c089560d81f5ee07d3 -MD5 6db7cfbeb01efbcfcf5981173fd023be files/gentoo-vdr-scripts-0.3.5-merged-file-permissions.diff 336 -RMD160 263aad626f433a461504dd698513dd2994734ebb files/gentoo-vdr-scripts-0.3.5-merged-file-permissions.diff 336 -SHA256 1262ef2aaccd6e5a82c45f9a93d2aba9aa7c07dc96ed05c089560d81f5ee07d3 files/gentoo-vdr-scripts-0.3.5-merged-file-permissions.diff 336 -AUX gentoo-vdr-scripts-0.3.5-skip-plugin.diff 758 RMD160 7d887d26d27064db44ca03dfe589a8364c406eb9 SHA1 1f7858caf67a3a83b12ac4e8c69b72a1225d454e SHA256 d61f177162708398802eb644090f74f351e0595d60093f0d19272c6c09498af0 -MD5 ee33557bed3731d8baf7689e38025f1a files/gentoo-vdr-scripts-0.3.5-skip-plugin.diff 758 -RMD160 7d887d26d27064db44ca03dfe589a8364c406eb9 files/gentoo-vdr-scripts-0.3.5-skip-plugin.diff 758 -SHA256 d61f177162708398802eb644090f74f351e0595d60093f0d19272c6c09498af0 files/gentoo-vdr-scripts-0.3.5-skip-plugin.diff 758 -AUX vdr-bg-quoting.patch 256 RMD160 094ce8cdd40307f1b5805da48cf25117ad5ffefd SHA1 37bad796e23501abeaf1990101606cb9904ac8e0 SHA256 ccf3ac1e05ec88795453b532dd6426acf0ba6bcbd36667644a3f3e179ceb7794 -MD5 102afb0ab8456cb129a8f3ae1e2b77ca files/vdr-bg-quoting.patch 256 -RMD160 094ce8cdd40307f1b5805da48cf25117ad5ffefd files/vdr-bg-quoting.patch 256 -SHA256 ccf3ac1e05ec88795453b532dd6426acf0ba6bcbd36667644a3f3e179ceb7794 files/vdr-bg-quoting.patch 256 -DIST gentoo-vdr-scripts-0.3.4.tar.bz2 21460 RMD160 0797e337559b081e95ef77b428d808b78245aaac SHA1 ff8ec5b0c20fbd01bd9844644fa2c59ae3679575 SHA256 2086f451d8a274d9bd489c0e9d24a37b07db15e8ebb6ca684ab6a24e807407da -DIST gentoo-vdr-scripts-0.3.5.tar.bz2 22643 RMD160 5782d55d2b62c11cd74193dd09588e4c9ca27b9a SHA1 8939dbcc97ef12118a7def8dffd3c7cd356523c5 SHA256 c099dc98b7979b7dc036268adc8f90082f180d9d7f225bdbdfce35fa8376b83d DIST gentoo-vdr-scripts-0.3.6.tar.bz2 23246 RMD160 e0c0ea7db23d77b419bb85cdd7c8e38357bd763e SHA1 04692027720b11ac79e24574524862cd7d5c937e SHA256 60c3889714f188a7412c9528bfcdd7c8a371ac4ec1ce35c27078a7776c96e896 -EBUILD gentoo-vdr-scripts-0.3.4-r1.ebuild 2728 RMD160 51790a6a6da97b565d7fe1e2c0140faef92840e5 SHA1 ad5e4505d63e68239771b041c09851d91e25cabf SHA256 0e903d3844c358678bf4b316f750fab76b92d6dd0abebbc3e78de469e9baf513 -MD5 376e51a0be2a7b2677a956514e78f5d0 gentoo-vdr-scripts-0.3.4-r1.ebuild 2728 -RMD160 51790a6a6da97b565d7fe1e2c0140faef92840e5 gentoo-vdr-scripts-0.3.4-r1.ebuild 2728 -SHA256 0e903d3844c358678bf4b316f750fab76b92d6dd0abebbc3e78de469e9baf513 gentoo-vdr-scripts-0.3.4-r1.ebuild 2728 -EBUILD gentoo-vdr-scripts-0.3.5-r2.ebuild 2766 RMD160 ab579360fe5703e646a65b0a7852e78048a207f8 SHA1 536456ec2b2c95e6fb381c5a546fec23c6f9f42d SHA256 e4af36b58f97ad2581415bb2562a7c58bd49556e314b27020385da699b57ead4 -MD5 e4d1bb4a798e5ba588f12dd1e88bda66 gentoo-vdr-scripts-0.3.5-r2.ebuild 2766 -RMD160 ab579360fe5703e646a65b0a7852e78048a207f8 gentoo-vdr-scripts-0.3.5-r2.ebuild 2766 -SHA256 e4af36b58f97ad2581415bb2562a7c58bd49556e314b27020385da699b57ead4 gentoo-vdr-scripts-0.3.5-r2.ebuild 2766 EBUILD gentoo-vdr-scripts-0.3.6.ebuild 3101 RMD160 28bf52dc1f73493f0c908bd724495fd8ca434b04 SHA1 0069b626c5b6fbc6868ecb767072015d15d9951e SHA256 6f7ebfc3e7c9c46740a61467590f97bbc3ffd93dd47bba31762945333f4a66e6 MD5 f872524bd552d5bf2f90901e38159ac2 gentoo-vdr-scripts-0.3.6.ebuild 3101 RMD160 28bf52dc1f73493f0c908bd724495fd8ca434b04 gentoo-vdr-scripts-0.3.6.ebuild 3101 SHA256 6f7ebfc3e7c9c46740a61467590f97bbc3ffd93dd47bba31762945333f4a66e6 gentoo-vdr-scripts-0.3.6.ebuild 3101 -MISC ChangeLog 13111 RMD160 42d3f428bf6a44eae4cab23114874680ddc8797d SHA1 7e4d2e30c74d6c7416cb8d4db8952d779dc88492 SHA256 3c81f0f3ceecc0cac49db17d34bd8327fa55b22313df47fba4d6690c5d804994 -MD5 3a13d19b240cf4aa08222f26d09955ce ChangeLog 13111 -RMD160 42d3f428bf6a44eae4cab23114874680ddc8797d ChangeLog 13111 -SHA256 3c81f0f3ceecc0cac49db17d34bd8327fa55b22313df47fba4d6690c5d804994 ChangeLog 13111 +MISC ChangeLog 13417 RMD160 9d11d6d21f28b5499247f3135702ac4f05bafd85 SHA1 7908b7b0e4a53287ee0c75f3759a387eeccf8a7b SHA256 b4ae6f5dda4ea904ce7fcf818d4dbf6ed983347d8310a69b153b95fcd9c40911 +MD5 ece2392cba9b62821268afb250279521 ChangeLog 13417 +RMD160 9d11d6d21f28b5499247f3135702ac4f05bafd85 ChangeLog 13417 +SHA256 b4ae6f5dda4ea904ce7fcf818d4dbf6ed983347d8310a69b153b95fcd9c40911 ChangeLog 13417 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26 metadata.xml 257 -MD5 be31a32d518744306e311099eaba790a files/digest-gentoo-vdr-scripts-0.3.4-r1 274 -RMD160 43a4648e6c8d3d78b03df2fd087812608a7d999a files/digest-gentoo-vdr-scripts-0.3.4-r1 274 -SHA256 f60bfc422f8868bc6afb822f1192af2f3738e80e1f078ccbd16dfbdc66113936 files/digest-gentoo-vdr-scripts-0.3.4-r1 274 -MD5 5660c4d171795ffb0118f52dccd536a6 files/digest-gentoo-vdr-scripts-0.3.5-r2 274 -RMD160 7d68fef3d6dfc1690b228ca473cdb759c94ff57f files/digest-gentoo-vdr-scripts-0.3.5-r2 274 -SHA256 bbbc9f334c6a05dd546add518388a36d002f8d014e698484b4933bdabe27a38e files/digest-gentoo-vdr-scripts-0.3.5-r2 274 MD5 105a6536a3a532d53ac3fa66b9d48314 files/digest-gentoo-vdr-scripts-0.3.6 274 RMD160 1cfccc40ed457300b960dbcb2584ed9aa758f48d files/digest-gentoo-vdr-scripts-0.3.6 274 SHA256 d714e62cbbdacf180b62c9b611b6e5d729141c9f7ff6519d67b4095b2a634ed3 files/digest-gentoo-vdr-scripts-0.3.6 274 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE2cGgt2vP6XvVdOcRAlUwAJ47XO65tDcWHnvbZ2Hzh8yErqomMgCgrnps -7gXnvYctQC+Z586gbNSufxA= -=2RUp +iD8DBQFFCHPFt2vP6XvVdOcRArbuAJ9dNyXRJfLYmDyhmCMgvznMeBwQrwCg1zE3 +wEKFzSzKTil4e7IaZTs2M8w= +=+5ty -----END PGP SIGNATURE----- diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.4-r1 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.4-r1 deleted file mode 100644 index 49f0528e51c7..000000000000 --- a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.4-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 83b8cb377161ac37d4986b14d757a05c gentoo-vdr-scripts-0.3.4.tar.bz2 21460 -RMD160 0797e337559b081e95ef77b428d808b78245aaac gentoo-vdr-scripts-0.3.4.tar.bz2 21460 -SHA256 2086f451d8a274d9bd489c0e9d24a37b07db15e8ebb6ca684ab6a24e807407da gentoo-vdr-scripts-0.3.4.tar.bz2 21460 diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.5-r2 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.5-r2 deleted file mode 100644 index 4b4129a8360c..000000000000 --- a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.3.5-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ab528a3a017c3cdd4ed5cc28b18f5f6b gentoo-vdr-scripts-0.3.5.tar.bz2 22643 -RMD160 5782d55d2b62c11cd74193dd09588e4c9ca27b9a gentoo-vdr-scripts-0.3.5.tar.bz2 22643 -SHA256 c099dc98b7979b7dc036268adc8f90082f180d9d7f225bdbdfce35fa8376b83d gentoo-vdr-scripts-0.3.5.tar.bz2 22643 diff --git a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.5-merged-file-permissions.diff b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.5-merged-file-permissions.diff deleted file mode 100644 index a7e85ff0eb1a..000000000000 --- a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.5-merged-file-permissions.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- gentoo-vdr-scripts-0.3.5/usr/share/vdr/inc/commands-functions.sh (Revision 299) -+++ gentoo-vdr-scripts-0.3.5/usr/share/vdr/inc/commands-functions.sh (Revision 300) -@@ -41,6 +41,8 @@ - echo >> "${mergedfile}" - done - -+ chown vdr:vdr "${mergedfile}" -+ - # link it to real location - if [[ -L "${destfile}" ]]; then - # remove link diff --git a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.5-skip-plugin.diff b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.5-skip-plugin.diff deleted file mode 100644 index 9da59dcad9cb..000000000000 --- a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.3.5-skip-plugin.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- gentoo-vdr-scripts-0.3.5/usr/share/vdr/inc/plugin-functions.sh 2006-06-16 15:15:06.000000000 +0200 -+++ gentoo-vdr-scripts-0.3.5/usr/share/vdr/inc/plugin-functions.sh 2006-06-19 13:10:16.000000000 +0200 -@@ -36,6 +36,7 @@ - } - - check_plugin() { -+ SKIP_PLUGIN=0 - local PLUGIN="${1}" - local plugin_file="${plugin_dir}/libvdr-${PLUGIN}.so.${APIVERSION}" - ---- gentoo-vdr-scripts-0.3.5/usr/share/vdr/rcscript/pre-start-95-plugins.sh 2006-06-16 15:15:06.000000000 +0200 -+++ gentoo-vdr-scripts-0.3.5/usr/share/vdr/rcscript/pre-start-95-plugins.sh 2006-06-19 13:10:16.000000000 +0200 -@@ -5,8 +5,6 @@ - addon_main() { - local PLUGIN - for PLUGIN in ${PLUGINS}; do -- SKIP_PLUGIN=0 -- - init_plugin_params ${PLUGIN} - - load_plugin ${PLUGIN} plugin_pre_vdr_start diff --git a/media-tv/gentoo-vdr-scripts/files/vdr-bg-quoting.patch b/media-tv/gentoo-vdr-scripts/files/vdr-bg-quoting.patch deleted file mode 100644 index d1612013f4d4..000000000000 --- a/media-tv/gentoo-vdr-scripts/files/vdr-bg-quoting.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- usr/lib/vdr/bin/vdr-bg.sh -+++ usr/lib/vdr/bin/vdr-bg.sh -@@ -4,4 +4,5 @@ - # Start command in background and disconnects outputs. - # Use this instead of echo "..." | at now - --${@} >/dev/null 2>&1 & -+export EXECUTED_BY_VDR_BG=1 -+"${@}" >/dev/null 2>&1 & diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.4-r1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.4-r1.ebuild deleted file mode 100644 index 08377e441e25..000000000000 --- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.4-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.4-r1.ebuild,v 1.2 2006/06/28 09:06:12 zzam Exp $ - -inherit eutils - -IUSE="nvram" - -SRC_URI="mirror://gentoo/${P}.tar.bz2" -DESCRIPTION="scripts necessary for use of vdr as a set-top-box" -HOMEPAGE="http://www.gentoo.org/" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~ppc x86" - -RDEPEND="nvram? ( x86? ( sys-power/nvram-wakeup ) ) - app-admin/sudo" - -VDR_HOME=/var/vdr - -pkg_setup() { - enewgroup vdr - if getent passwd vdr >/dev/null 2>&1; then - einfo "Modifying user vdr" - usermod -g vdr -s /bin/bash vdr - local grp - for grp in video audio cdrom; do - gpasswd -a vdr ${grp} >/dev/null - done - else - enewuser vdr -1 /bin/bash ${VDR_HOME} vdr,video,audio,cdrom - fi -} - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/vdr-bg-quoting.patch -} - -src_install() { - make install DESTDIR="${D}" || die "make install failed" - dodoc README TODO ChangeLog - - if use nvram; then - if use x86; then - make install-nvram DESTDIR="${D}" || die "make install-nvram failed" - else - ewarn "nvram-wakeup is not available on this architecture." - fi - fi - - keepdir /var/vdr/shutdown-data - keepdir /var/vdr/merged-config-files - keepdir /var/vdr/video/dvd-images - chown vdr:vdr -R ${D}/var/vdr -} - -pkg_preinst() { - local owner - local d - for d in /etc/vdr /var/vdr; do - if [[ -d ${d} ]]; then - owner=$(stat ${d} -c "%U") - if [[ ${owner} != vdr ]]; then - einfo "Changing ownership of ${d}" - chown -R vdr:vdr ${d} - fi - fi - done -} - -VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/lib/vdr/bin/vdrshutdown-really.sh" - -pkg_postinst() { - einfo - einfo "To make shutdown work add this line to /etc/sudoers" - einfo " $VDRSUDOENTRY" - einfo - einfo "or execute this command:" - einfo " emerge --config gentoo-vdr-scripts" - einfo - ewarn "The default video directory was moved to /var/vdr/video" - ewarn "If you have your video directory anywhere else, then" - ewarn "change the setting VIDEO in the file /etc/conf.d/vdr." - ewarn - if use x86 && use !nvram; then - ewarn "nvram wakeup is now optional." - ewarn "To make use of it enable the use flag nvram." - fi -} - -pkg_config() { - if grep -q /usr/lib/vdr/bin/vdrshutdown-really.sh ${ROOT}/etc/sudoers; then - einfo "sudoers-entry for vdr already in place." - else - einfo "Adding this line to /etc/sudoers:" - einfo "+ ${VDRSUDOENTRY}" - - cd ${T} - cat >sudoedit-vdr.sh <<-SUDOEDITOR - #!/bin/bash - echo "" >> \${1} - echo "${VDRSUDOENTRY}" >> \${1} - SUDOEDITOR - chmod a+x sudoedit-vdr.sh - - VISUAL=${T}/sudoedit-vdr.sh visudo -f ${ROOT}/etc/sudoers || die "visudo failed" - - einfo "Edited /etc/sudoers" - fi -} - diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.5-r2.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.5-r2.ebuild deleted file mode 100644 index 1695eec40e3e..000000000000 --- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.5-r2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.5-r2.ebuild,v 1.1 2006/07/06 13:02:34 zzam Exp $ - -inherit eutils - -IUSE="nvram" - -SRC_URI="mirror://gentoo/${P}.tar.bz2" -DESCRIPTION="scripts necessary for use of vdr as a set-top-box" -HOMEPAGE="http://www.gentoo.org/" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND="nvram? ( x86? ( sys-power/nvram-wakeup ) ) - app-admin/sudo" - -VDR_HOME=/var/vdr - -pkg_setup() { - enewgroup vdr - enewuser vdr -1 /bin/bash ${VDR_HOME} vdr,video,audio,cdrom -} - -src_unpack() { - unpack ${A} - - epatch ${FILESDIR}/${P}-skip-plugin.diff - epatch ${FILESDIR}/${P}-merged-file-permissions.diff -} - -src_install() { - local myopts="" - if use nvram; then - if use x86; then - myopts="${myopts} NVRAM=1" - else - ewarn "nvram-wakeup is not available on this architecture." - fi - fi - - make install DESTDIR="${D}" ${myopts} || die "make install failed" - dodoc README TODO ChangeLog - - - keepdir /var/vdr/shutdown-data - keepdir /var/vdr/merged-config-files - keepdir /var/vdr/dvd-images - - local MAKE_VIDEO_DIR=1 - local testd - for testd in video0 video00 video.0 video.00; do - [[ -d ${ROOT}/var/vdr/${testd} ]] && MAKE_VIDEO_DIR=0 - done - if [[ ${MAKE_VIDEO_DIR} == 1 ]]; then - keepdir /var/vdr/video - fi - - chown vdr:vdr -R ${D}/var/vdr -} - -pkg_preinst() { - local owner - local d - for d in /etc/vdr /var/vdr; do - if [[ -d ${d} ]]; then - owner=$(stat ${d} -c "%U") - if [[ ${owner} != vdr ]]; then - einfo "Changing ownership of ${d}" - chown -R vdr:vdr ${d} - fi - fi - done -} - -VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/lib/vdr/bin/vdrshutdown-really.sh" - -pkg_postinst() { - einfo - einfo "To make shutdown work add this line to /etc/sudoers" - einfo " $VDRSUDOENTRY" - einfo - einfo "or execute this command:" - einfo " emerge --config gentoo-vdr-scripts" - einfo - ewarn "The default video directory was moved to /var/vdr/video" - ewarn "If you have your video directory anywhere else, then" - ewarn "change the setting VIDEO in the file /etc/conf.d/vdr." - ewarn - if use x86 && use !nvram; then - ewarn "nvram wakeup is now optional." - ewarn "To make use of it enable the use flag nvram." - fi -} - -pkg_config() { - if grep -q /usr/lib/vdr/bin/vdrshutdown-really.sh ${ROOT}/etc/sudoers; then - einfo "sudoers-entry for vdr already in place." - else - einfo "Adding this line to /etc/sudoers:" - einfo "+ ${VDRSUDOENTRY}" - - cd ${T} - cat >sudoedit-vdr.sh <<-SUDOEDITOR - #!/bin/bash - echo "" >> \${1} - echo "${VDRSUDOENTRY}" >> \${1} - SUDOEDITOR - chmod a+x sudoedit-vdr.sh - - VISUAL=${T}/sudoedit-vdr.sh visudo -f ${ROOT}/etc/sudoers || die "visudo failed" - - einfo "Edited /etc/sudoers" - fi -} - |