Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -r1.108.2.11 -r1.108.2.12 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 10 Oct 2013 20:44:07 -0000 1.108.2.11 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 16 Oct 2013 19:49:09 -0000 1.108.2.12 @@ -675,7 +675,7 @@ Simple basic package install function. Wraps up basically what the old install xml action did. } { - set package_info_path "[acs_root_dir]/packages/${package_key}/*.info" + set package_info_path "$::acs::rootdir/packages/${package_key}/*.info" set install_spec_files [list] foreach install_spec_file [glob -nocomplain $package_info_path] { @@ -695,7 +695,7 @@ } set pkg_info_list [list] - foreach spec_file [glob -nocomplain "[acs_root_dir]/packages/*/*.info"] { + foreach spec_file [glob -nocomplain "$::acs::rootdir/packages/*/*.info"] { # Get package info, and find out if this is a package we should install if { [catch { array set package [apm_read_package_info_file $spec_file] @@ -774,8 +774,8 @@ } # Move the package into the packages dir - #exec "mv" "$package_path" "[acs_root_dir]/packages" - file rename $package_path [acs_root_dir]/packages + #exec "mv" "$package_path" "$::acs::rootdir/packages" + file rename $package_path $::acs::rootdir/packages # We moved the spec file, so update its path set package_path $old_package_path @@ -1092,7 +1092,7 @@ apm_callback_and_log $callback "
  • Moving packages/$package_key to $backup_dir... " - if { [catch { file rename "[acs_root_dir]/packages/$package_key" $backup_dir } error] } { + if { [catch { file rename "$::acs::rootdir/packages/$package_key" $backup_dir } error] } { apm_callback_and_log $callback "[ns_quotehtml $error]" } else { apm_callback_and_log $callback "moved." @@ -2111,7 +2111,7 @@ } } else { # Parse spec files - foreach spec_file [apm_scan_packages "[acs_root_dir]/packages"] { + foreach spec_file [apm_scan_packages "$::acs::rootdir/packages"] { with_catch errmsg { array unset version array set version [apm_read_package_info_file $spec_file] @@ -2167,7 +2167,7 @@ @creation-date 2003-10-30 } { # Abort if there is no install.xml file - set filename [acs_root_dir]$filename + set filename $::acs::rootdir$filename if { ![file exists $filename] } { error "File $filename not found"