[Zope-Checkins] CVS: Zope/lib/python/ZEO - mkzeoinst.py:1.20

[Chris McDonough]

BTW, would anyone mind if I removed the "already listening on port" test
from this script?  It's very annoying to have it not install due to a
port conflict;  I don't mind if it whines at me when it tries to start,
but I do want it to copy files regardless of whether something is
already listening on the port I've specified or not.

On Wed, 2004-02-18 at 13:16, Tres Seaver wrote:
> Update of /cvs-repository/Zope/lib/python/ZEO
> In directory cvs.zope.org:/tmp/cvs-serv24285
> 
> Modified Files:
> 	mkzeoinst.py 
> Log Message:
>  - Port s/Zope/ZODB/ from Zope-2_7-branch.
> 
> 
> === Zope/lib/python/ZEO/mkzeoinst.py 1.19 => 1.20 ===
> --- Zope/lib/python/ZEO/mkzeoinst.py:1.19	Fri Oct 24 17:29:43 2003
> +++ Zope/lib/python/ZEO/mkzeoinst.py	Wed Feb 18 13:16:35 2004
> @@ -73,7 +73,7 @@
>    default-to-interactive true
>    # user zope
>    python %(python)s
> -  zdrun %(zope_home)s/zdaemon/zdrun.py
> +  zdrun %(zodb3_home)s/zdaemon/zdrun.py
>  
>    # This logfile should match the one in the %(package)s.conf file.
>    # It is used by zdctl's logtail command, zdrun/zdctl doesn't write it.
> @@ -94,14 +94,14 @@
>  # description: start a %(PACKAGE)s server
>  
>  PYTHON="%(python)s"
> -ZOPE_HOME="%(zope_home)s"
> +ZODB3_HOME="%(zodb3_home)s"
>  
>  CONFIG_FILE="%(instance_home)s/etc/%(package)s.conf"
>  
> -PYTHONPATH="$ZOPE_HOME"
> +PYTHONPATH="$ZODB3_HOME"
>  export PYTHONPATH
>  
> -ZEOCTL="$ZOPE_HOME/ZEO/zeoctl.py"
> +ZEOCTL="$ZODB3_HOME/ZEO/zeoctl.py"
>  
>  exec "$PYTHON" "$ZEOCTL" -C "$CONFIG_FILE" ${1+"$@"}
>  """
> @@ -111,14 +111,14 @@
>  # %(PACKAGE)s instance start script
>  
>  PYTHON="%(python)s"
> -ZOPE_HOME="%(zope_home)s"
> +ZODB3_HOME="%(zodb3_home)s"
>  
>  CONFIG_FILE="%(instance_home)s/etc/%(package)s.conf"
>  
> -PYTHONPATH="$ZOPE_HOME"
> +PYTHONPATH="$ZODB3_HOME"
>  export PYTHONPATH
>  
> -RUNZEO="$ZOPE_HOME/ZEO/runzeo.py"
> +RUNZEO="$ZODB3_HOME/ZEO/runzeo.py"
>  
>  exec "$PYTHON" "$RUNZEO" -C "$CONFIG_FILE" ${1+"$@"}
>  """
> @@ -149,8 +149,8 @@
>              instance_home = os.path.abspath(instance_home)
>  
>          for entry in sys.path:
> -            if os.path.exists(os.path.join(entry, 'Zope')):
> -                zope_home = entry
> +            if os.path.exists(os.path.join(entry, 'ZODB')):
> +                zodb3_home = entry
>                  break
>          else:
>              print "Can't find the Zope home (not in sys.path)"
> @@ -162,14 +162,14 @@
>              port = 9999
>          checkport(port)
>  
> -        params = self.get_params(zope_home, instance_home, port)
> +        params = self.get_params(zodb3_home, instance_home, port)
>          self.create(instance_home, params)
>  
> -    def get_params(self, zope_home, instance_home, port):
> +    def get_params(self, zodb3_home, instance_home, port):
>          return {
>              "package": "zeo",
>              "PACKAGE": "ZEO",
> -            "zope_home": zope_home,
> +            "zodb3_home": zodb3_home,
>              "instance_home": instance_home,
>              "port": port,
>              "python": sys.executable,
> 
> 
> _______________________________________________
> Zope-Checkins maillist  -  Zope-Checkins at zope.org
> http://mail.zope.org/mailman/listinfo/zope-checkins