[Zope-CVS] CVS: Products/OSCOM - buildout_zope_sandbox:1.4

[Tres Seaver]

Update of /cvs-repository/Products/OSCOM
In directory cvs.zope.org:/tmp/cvs-serv6297

Modified Files:
	buildout_zope_sandbox 
Log Message:


  - Get rid of silly sed-isms.


=== Products/OSCOM/buildout_zope_sandbox 1.3 => 1.4 ===
--- Products/OSCOM/buildout_zope_sandbox:1.3	Wed May  7 15:30:29 2003
+++ Products/OSCOM/buildout_zope_sandbox	Wed May  7 15:45:14 2003
@@ -347,49 +347,48 @@
 #------------------------------------------------------------------------------
 #   Set up start / stop scripts
 #------------------------------------------------------------------------------
-cd $bindir
 
 if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6.2" ]; then
-    sed -e "s#<<SANDBOX>>#$sandbox#" > start_zeo << START_ZEO_EOF
+    cat > $bindir/start_zeo << START_ZEO_EOF
 #!/bin/sh
 #------------------------------------------------------------------------------
 #   Start ZEO storage server
 #------------------------------------------------------------------------------
 zeo_port=8001
-python=<<SANDBOX>>/bin/python
-zeo_start=<<SANDBOX>>/opt/Zope/lib/python/ZEO/start.py
+python=$bindir/python
+zeo_start=$optdir/Zope/lib/python/ZEO/start.py
 
-INSTANCE_HOME=<<SANDBOX>>/var/storage
+INSTANCE_HOME=$vardir/storage
 export INSTANCE_HOME
 
 echo \$python \$zeo_start -p \$zeo_port "\$@"
 \$python \$zeo_start -p \$zeo_port "\$@"
 START_ZEO_EOF
-    chmod +x start_zeo
+    chmod +x $bindir/start_zeo
 
-    sed -e "s#<<SANDBOX>>#$sandbox#" > stop_zeo << STOP_ZEO_EOF
+    cat > $bindir/stop_zeo << STOP_ZEO_EOF
 #!/bin/sh
 #------------------------------------------------------------------------------
 #   Stop ZEO storage server
 #------------------------------------------------------------------------------
-pid=\`cat <<SANDBOX>>/var/storage/var/ZEO_SERVER.pid\`
+pid=\`cat $vardir/storage/var/ZEO_SERVER.pid\`
 
 echo kill "\$@" \$pid
 kill "\$@" \$pid
 STOP_ZEO_EOF
-    chmod +x stop_zeo
+    chmod +x $bindir/stop_zeo
 
-    sed -e "s#<<SANDBOX>>#$sandbox#" > start_zope << START_ZOPE_EOF
+    cat > $bindir/start_zope << START_ZOPE_EOF
 #!/bin/sh
 #------------------------------------------------------------------------------
 #   Start Zope application storage server
 #------------------------------------------------------------------------------
 www_port=8080
-python=<<SANDBOX>>/bin/python
-zope_home=<<SANDBOX>>/opt/Zope
+python=$bindir/python
+zope_home=$optdir/Zope
 zope_start=\$zope_home/z2.py
 
-INSTANCE_HOME=<<SANDBOX>>/var/zope
+INSTANCE_HOME=$vardir/zope
 SOFTWARE_HOME=\$zope_home/lib/python
 PYTHONPATH=\$SOFTWARE_HOME:\$PYTHONPATH
 export INSTANCE_HOME SOFTWARE_HOME PYTHONPATH
@@ -397,19 +396,19 @@
 echo \$python \$zope_start -X -w \$www_port "\$@"
 \$python \$zope_start -X -w \$www_port "\$@"
 START_ZOPE_EOF
-    chmod +x start_zope
+    chmod +x $bindir/start_zope
 
-    sed -e "s#<<SANDBOX>>#$sandbox#" > stop_zope << STOP_ZOPE_EOF
+    cat > $bindir/stop_zope << STOP_ZOPE_EOF
 #!/bin/sh
 #------------------------------------------------------------------------------
 #   Stop Zope application server
 #------------------------------------------------------------------------------
-pid=\`cat <<SANDBOX>>/var/zope/var/Z2.pid\`
+pid=\`cat $vardir/zope/var/Z2.pid\`
 
 echo kill "\$@" \$pid
 kill "\$@" \$pid
 STOP_ZOPE_EOF
-    chmod +x stop_zope
+    chmod +x $bindir/stop_zope
 
 else  # Zope 2.7+