[Zope-Checkins] CVS: Zope/skel/bin - runzope.in:1.1.2.2 zopectl.in:1.1.2.2

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/skel/bin
In directory cvs.zope.org:/tmp/cvs-serv29507

Modified Files:
      Tag: new-install-branch
	runzope.in zopectl.in 
Log Message:
Simplify wrapper scripts a little bit.

=== Zope/skel/bin/runzope.in 1.1.2.1 => 1.1.2.2 ===
--- Zope/skel/bin/runzope.in:1.1.2.1	Wed Feb  5 18:09:11 2003
+++ Zope/skel/bin/runzope.in	Thu Feb  6 13:48:46 2003
@@ -4,12 +4,9 @@
 ZOPE_HOME="<<ZOPE_HOME>>"
 INSTANCE_HOME="<<INSTANCE_HOME>>"
 
-SOFTWARE_HOME="$ZOPE_HOME/lib/python"
+CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf"
 
-CONFIG_DIR="$INSTANCE_HOME/etc"
-CONFIG_FILE="$CONFIG_DIR/zope.conf"
-
-PYTHONPATH="$SOFTWARE_HOME"
+PYTHONPATH="$ZOPE_HOME/lib/python"
 export PYTHONPATH
 
 "$PYTHON" "$ZOPE_HOME/bin/runzope.py" -C "$CONFIG_FILE" "$@"


=== Zope/skel/bin/zopectl.in 1.1.2.1 => 1.1.2.2 ===
--- Zope/skel/bin/zopectl.in:1.1.2.1	Wed Feb  5 18:09:11 2003
+++ Zope/skel/bin/zopectl.in	Thu Feb  6 13:48:46 2003
@@ -4,12 +4,9 @@
 ZOPE_HOME="<<ZOPE_HOME>>"
 INSTANCE_HOME="<<INSTANCE_HOME>>"
 
-SOFTWARE_HOME="$ZOPE_HOME/lib/python"
+CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf"
 
-CONFIG_DIR="$INSTANCE_HOME/etc"
-CONFIG_FILE="$CONFIG_DIR/zope.conf"
-
-PYTHONPATH="$SOFTWARE_HOME"
+PYTHONPATH="$ZOPE_HOME/lib/python"
 export PYTHONPATH
 
 "$PYTHON" "$ZOPE_HOME/bin/zopectl.py" -C "$CONFIG_FILE" "$@"