Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	5 Jul 2004 14:58:27 -0000	1.15
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	25 Jan 2005 23:51:57 -0000	1.16
@@ -327,17 +327,10 @@
     # Peter Marklund
     # We need to be able to invoke ad_conn in the installer. However
     # We cannot use the rp_filter that sets up ad_conn
-    proc ad_conn { args } {
-        set attribute [lindex $args 0]
-
-        if { [string equal $attribute "-connected_p"] } {
-            set return_value 1
-        } elseif { [catch {set return_value [ns_conn $attribute] } error] } {
-            set return_value ""
-        }
-
-        return $return_value
-    }
+    ad_conn -set connected_p 1
+    ad_conn -set user_id {}
+    ad_conn -set node_id {}
+    ad_conn -set package_id {}
 }
 
 ad_proc -public ad_windows_p {} {
@@ -461,11 +454,6 @@
 
         ns_write "</pre></blockquote>"
 
-        # Now process the application bundle if an install.xml file was found.
-        if { [file exists "[acs_root_dir]/install.xml"] } {
-            set output [apm::process_install_xml "/install.xml" {}]
-            ns_write "<p>[join $output "</p><p>"]</p>"
-        }
     }
 
 
Index: openacs-4/packages/acs-bootstrap-installer/installer/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/install.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-bootstrap-installer/installer/install.tcl	11 Dec 2003 18:02:26 -0000	1.7
+++ openacs-4/packages/acs-bootstrap-installer/installer/install.tcl	25 Jan 2005 23:51:57 -0000	1.8
@@ -51,33 +51,6 @@
 
 install_do_packages_install
 
-##############
-#
-# Load message catalogs
-#
-#############
-
-# Doing this before restart so that keys are available in init files on startup
-ns_write "<p>Loading message catalogs..."
-lang::catalog::import -initialize
-ns_write "  <p>Done.<p>"
-
-##############
-#
-# Secret tokens
-#
-#############
-
-ns_write "<p>Generating secret tokens..."
-populate_secret_tokens_db
-ns_write "  <p>Done.<p>"
-
-##############
-#
-# Admin create
-#
-#############
-
 if { [empty_string_p $username] } {
     set username $email
 }
@@ -123,10 +96,41 @@
     rename util_memoize_flush {}
     rename util_memoize_flush_saved util_memoize_flush
   }
+  ad_conn -set user_id $user_id
 }
 
+# Now process the application bundle if an install.xml file was found.
+
+if { [file exists "[acs_root_dir]/install.xml"] } {
+    set output [apm::process_install_xml "/install.xml" {}]
+    ns_write "<p>[join $output "</p><p>"]</p>"
+}
+
+
 ##############
 #
+# Load message catalogs
+#
+#############
+
+
+# Doing this before restart so that keys are available in init files on startup
+ns_write "<p>Loading message catalogs..."
+lang::catalog::import -initialize
+ns_write "  <p>Done.<p>"
+
+##############
+#
+# Secret tokens
+#
+#############
+
+ns_write "<p>Generating secret tokens..."
+populate_secret_tokens_db
+ns_write "  <p>Done.<p>"
+
+##############
+#
 # System settings
 #
 #############