diff options
| author |   Mike Auty <ikelos@gentoo.org> | 2007-04-09 17:51:11 +0000 |
|---|---|---|
| committer | Mike Auty <ikelos@gentoo.org> | 2007-04-09 17:51:11 +0000 |
| commit | a016385188e5355f0addae9a9dd7741fb3c50149 (patch) | |
| tree | 06c9ca6e90f329ee8fbdce7843beafe411fb4cb4 | |
| parent | Fix up vmware-server.rc to correct bug 173752. (diff) | |
| download | vmware-a016385188e5355f0addae9a9dd7741fb3c50149.tar.gz vmware-a016385188e5355f0addae9a9dd7741fb3c50149.tar.bz2 vmware-a016385188e5355f0addae9a9dd7741fb3c50149.zip | |
Fix up botched copy from last commit.
svn path=/trunk/; revision=162
| -rw-r--r-- | app-emulation/vmware-server/Manifest | 8 | ||||
| -rw-r--r-- | app-emulation/vmware-server/files/vmware-server.rc | 34 |
2 files changed, 21 insertions, 21 deletions
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest index c3cd82f..91a1d89 100644 --- a/app-emulation/vmware-server/Manifest +++ b/app-emulation/vmware-server/Manifest @@ -38,10 +38,10 @@ AUX vmware-authd 315 RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 SHA1 91bb3c MD5 a237d4e862ce8615d286c979dd9fd2fd files/vmware-authd 315 RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 files/vmware-authd 315 SHA256 490794ea4c6e35fb4113c8cf17d3872ae5877ddec5f8e0164203e96cf48f5ef2 files/vmware-authd 315 -AUX vmware-server.rc 1554 RMD160 d7b55b0550e50546c81b73a5d8bdccce9dba174f SHA1 4e2b997abea3637bbb367c0031bd08cd4062bb0c SHA256 bc291b2c30daadc78ee44f0f2f9b282a8236dcc5a90a969f21df5c042b3b085b -MD5 d422c95a6adac0702e415018ecfcdd9b files/vmware-server.rc 1554 -RMD160 d7b55b0550e50546c81b73a5d8bdccce9dba174f files/vmware-server.rc 1554 -SHA256 bc291b2c30daadc78ee44f0f2f9b282a8236dcc5a90a969f21df5c042b3b085b files/vmware-server.rc 1554 +AUX vmware-server.rc 1596 RMD160 8c15de411e319506fa1495221fd400c59888f695 SHA1 7b3888f6ea70cc564c78e0c7b1209b608ce60ca0 SHA256 b854f1914a6db95ded85ee67b3868f2c873ee6d43b27f845077e6949bb2690d5 +MD5 a248c33e8e4e7cdac5d0a705582dd051 files/vmware-server.rc 1596 +RMD160 8c15de411e319506fa1495221fd400c59888f695 files/vmware-server.rc 1596 +SHA256 b854f1914a6db95ded85ee67b3868f2c873ee6d43b27f845077e6949bb2690d5 files/vmware-server.rc 1596 AUX vmware-server.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d MD5 aa1b576735134579f04b29763901dc4f files/vmware-server.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware-server.xml 1592 diff --git a/app-emulation/vmware-server/files/vmware-server.rc b/app-emulation/vmware-server/files/vmware-server.rc index ed45dd5..21374f8 100644 --- a/app-emulation/vmware-server/files/vmware-server.rc +++ b/app-emulation/vmware-server/files/vmware-server.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.1 2006/07/31 20:23:50 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.3 2007/04/09 17:49:47 ikelos Exp $ depend() { need localmount xinetd @@ -16,17 +16,17 @@ vmware-prettify() { msgtype=0 while read line do - [ "$line" == "" ] && continue - if [ "$msgtype" -le "0" ] + [[ "${line}" == "" ]] && continue + if [[ "${msgtype}" -le "0" ]] then - if [ "$msgtype" == "-1" ] + if [[ "${msgtype}" == "-1" ]] then - ewarn $line + ewarn ${line} continue fi - if [ "${line/*:*/}" == "" ] + if [[ "${line/*:*/}" == "" ]] then - einfon $line + einfon ${line} echo eend 0 msgtype=1 @@ -37,7 +37,7 @@ vmware-prettify() { eend 0 msgtype=0 else - ewarn $line + ewarn ${line} msgtype=-1 waserror=1 fi @@ -45,25 +45,25 @@ vmware-prettify() { fi # Strip out anything after the <esc> code - message=`echo $line | sed -e "s/^\(.*\).*$/\1/"` - einfon " $message" + message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"` + einfon " ${message}" echo - echo $line | grep done > /dev/null + echo ${line} | grep done > /dev/null status=$? - eend $status + eend ${status} - if [ "$status" != "0" ] + if [[ "${status}" != "0" ]] then - logger -p local0.err -t vmware-${state} "$line" - waserror=$status + logger -p local0.err -t vmware-${state} "${line}" + waserror=${status} fi done - if [ "$msgtype" == "-1" ] + if [[ "${msgtype}" == "-1" ]] then eend 1 "VMware is not properly configured! See above." fi - return $waserror + return ${waserror} } start() { |