Index: openacs-4/etc/install/install.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.sh,v
diff -u -r1.38 -r1.39
--- openacs-4/etc/install/install.sh	8 Dec 2003 16:35:57 -0000	1.38
+++ openacs-4/etc/install/install.sh	9 Dec 2003 09:17:54 -0000	1.39
@@ -260,7 +260,7 @@
 x=0
 while test "$x" -lt $shutdown_loop_count ; do
 
-    pid=`grep_for_pid "nsd.*$aolserver_config_file"`
+    pid=`grep_for_pid "nsd.*${serverroot}/etc/config.tcl"`
     if [ "$pid" == "" ]; then
 	echo "$(date): Server is down"
 	break
@@ -272,7 +272,7 @@
 done
 
 # Verify that the server is down, and abort if not  
-pid=$(grep_for_pid "nsd.*$aolserver_config_file")
+pid=$(grep_for_pid "nsd.*${serverroot}/etc/config.tcl")
 if ! [ "$pid" == "" ]; then
     echo "$(date): Cannot stop the server. You must shut down the server first."
     exit -1
Index: openacs-4/etc/install/oracle/recreate-user.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/oracle/recreate-user.sh,v
diff -u -r1.2 -r1.3
--- openacs-4/etc/install/oracle/recreate-user.sh	10 Sep 2003 09:56:50 -0000	1.2
+++ openacs-4/etc/install/oracle/recreate-user.sh	9 Dec 2003 09:17:13 -0000	1.3
@@ -8,7 +8,7 @@
 
 system_user=`get_config_param system_user` 
 system_user_password=`get_config_param system_user_password` 
-oracle_user=`get_config_param oracle_user` 
+oracle_user=`get_config_param db_name` 
 oracle_password=`get_config_param oracle_password` 
 
 cat ${script_path}/user-drop.sql | perl -pi -e "s/:oracle_user/$oracle_user/g" | \