Index: openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl	18 Sep 2003 17:18:40 -0000	1.12
+++ openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl	25 Sep 2003 10:47:55 -0000	1.13
@@ -14,8 +14,6 @@
 set pkg_install_list [ad_get_client_property apm pkg_install_list]
 set pkg_enable_list [ad_get_client_property apm pkg_enable_list]
 set sql_file_paths [ad_get_client_property apm sql_file_paths]
-set install_path [ad_get_client_property apm install_path]
-set copy_files_p [ad_get_client_property apm copy_files_p]
 
 ReturnHeaders
 ns_write "[apm_header  "Package Installation"]
@@ -34,6 +32,8 @@
 set installed_count 0
 foreach pkg_info $pkg_install_list {
     set spec_file [pkg_info_spec $pkg_info]
+    set package_path [pkg_info_path $pkg_info]
+
     if { [catch {
 	array set version [apm_read_package_info_file $spec_file]
     } errmsg] } {
@@ -67,28 +67,18 @@
     }
 
     # Install the packages.
-    ns_log Debug "APM: Installing packages from $install_path."
-    if {$copy_files_p} {
-	set version_id [apm_package_install -install_path $install_path \
-		-callback apm_ns_write_callback -copy_files -load_data_model \
-		-data_model_files $data_model_files \
-                -mount_path $selected_mount_path \
-                $spec_file]
-	if {$version_id != 0} {
-	    file delete -force $install_path/$package_key
-	}
-    } else {
-        set enable_p [expr [lsearch -exact $pkg_enable_list $package_key] != -1]
+    ns_log Debug "APM: Installing package at $package_path."
 
-	set version_id [apm_package_install \
+    set enable_p [expr [lsearch -exact $pkg_enable_list $package_key] != -1]
+
+    set version_id [apm_package_install \
                 -enable=$enable_p \
-                -install_path $install_path \
+                -package_path $package_path \
 		-callback apm_ns_write_callback \
                 -load_data_model \
 		-data_model_files $data_model_files \
                 -mount_path $selected_mount_path \
                 $spec_file]
-    }
 
     if { $version_id == 0 } {
         # Installation of the package failed and we shouldn't continue with installation