diff options
Diffstat (limited to 'www-misc/xxv')
| -rw-r--r-- | www-misc/xxv/ChangeLog | 6 | ||||
| -rw-r--r-- | www-misc/xxv/files/xxv.utf8-v3 | 18 | ||||
| -rw-r--r-- | www-misc/xxv/files/xxv.utf8-v4 | 18 |
3 files changed, 25 insertions, 17 deletions
diff --git a/www-misc/xxv/ChangeLog b/www-misc/xxv/ChangeLog index 3842aed61d89..d3b164b2c7b2 100644 --- a/www-misc/xxv/ChangeLog +++ b/www-misc/xxv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-misc/xxv # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.6 2009/05/02 13:11:45 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.7 2009/05/02 17:39:39 hd_brummy Exp $ + + 02 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org> files/xxv.utf8-v3, + files/xxv.utf8-v4: + fixed initscript; thanks to heiliger @vdrportal.de *xxv-1.3.1 (02 May 2009) diff --git a/www-misc/xxv/files/xxv.utf8-v3 b/www-misc/xxv/files/xxv.utf8-v3 index cb8a3af74276..e56d4ee7df92 100644 --- a/www-misc/xxv/files/xxv.utf8-v3 +++ b/www-misc/xxv/files/xxv.utf8-v3 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v3,v 1.1 2009/04/16 00:28:31 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v3,v 1.2 2009/05/02 17:39:39 hd_brummy Exp $ RUNAS_USER="root" @@ -44,9 +44,10 @@ xxv_kill_pid() { # After unclear stop, xxvd.pid will not removed, fixed with next line if [ ! -x /etc/init.d/root ]; then - [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ] - rm ${PIDFILE} - killall xxvd 2> /dev/null + if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then + rm ${PIDFILE} + killall xxvd 2> /dev/null + fi fi } @@ -56,10 +57,11 @@ xxv_kill_initfile() { # After unclear stop, init file in /var/lib/init.d/started/ still not removed if [ ! -x /etc/init.d/root ]; then - [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ] - rm /var/lib/init.d/started/xxv - /etc/init.d/xxv zap - killall xxvd 2> /dev/null + if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then + rm /var/lib/init.d/started/xxv + /etc/init.d/xxv zap + killall xxvd 2> /dev/null + fi fi } diff --git a/www-misc/xxv/files/xxv.utf8-v4 b/www-misc/xxv/files/xxv.utf8-v4 index f0d6a4890c0d..c1f3d0b8ead3 100644 --- a/www-misc/xxv/files/xxv.utf8-v4 +++ b/www-misc/xxv/files/xxv.utf8-v4 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v4,v 1.1 2009/05/02 13:11:44 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v4,v 1.2 2009/05/02 17:39:39 hd_brummy Exp $ RUNAS_USER="vdr" @@ -41,9 +41,10 @@ xxv_kill_pid() { # After unclear stop, xxvd.pid will not removed, fixed with next line if [ ! -x /etc/init.d/root ]; then - [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ] - rm ${PIDFILE} - killall xxvd 2> /dev/null + if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then + rm ${PIDFILE} + killall xxvd 2> /dev/null + fi fi } @@ -53,10 +54,11 @@ xxv_kill_initfile() { # After unclear stop, init file in /var/lib/init.d/started/ still not removed if [ ! -x /etc/init.d/root ]; then - [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ] - rm /var/lib/init.d/started/xxv - /etc/init.d/xxv zap - killall xxvd 2> /dev/null + if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then + rm /var/lib/init.d/started/xxv + /etc/init.d/xxv zap + killall xxvd 2> /dev/null + fi fi } |