Index: openacs-4/packages/acs-core-docs/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/index.vuh,v diff -u -r1.2.26.1 -r1.2.26.2 --- openacs-4/packages/acs-core-docs/www/index.vuh 8 Sep 2013 08:11:57 -0000 1.2.26.1 +++ openacs-4/packages/acs-core-docs/www/index.vuh 17 Oct 2013 09:08:34 -0000 1.2.26.2 @@ -10,7 +10,7 @@ if {[ad_conn path_info] eq "index.html" } { rp_internal_redirect "/packages/acs-core-docs/www/index.adp" -} elseif {[file isdirectory "[acs_root_dir]/packages/$package_key/www/doc"]} { +} elseif {[file isdirectory "$::acs::rootdir/packages/$package_key/www/doc"]} { rp_internal_redirect "/packages/$package_key/www/$path_tail" } else { rp_internal_redirect "/packages/$package_key/$path_tail" Index: openacs-4/packages/acs-core-docs/www/tutorial-categories.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-categories.html,v diff -u -r1.13.4.3 -r1.13.4.4 --- openacs-4/packages/acs-core-docs/www/tutorial-categories.html 9 Sep 2013 16:50:34 -0000 1.13.4.3 +++ openacs-4/packages/acs-core-docs/www/tutorial-categories.html 17 Oct 2013 09:08:35 -0000 1.13.4.4 @@ -236,7 +236,7 @@ # Cut the URL off the last item in the context bar if { [llength $context] > 0 } { - set context [lreplace $context end end [lindex [lindex $context end] end]] + set context [lreplace $context end end [lindex $context end end]] } db_multirow -unclobber -extend { category_name tree_name } categories categories { Index: openacs-4/packages/acs-core-docs/www/update-repository.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/update-repository.html,v diff -u -r1.17.2.1 -r1.17.2.2 --- openacs-4/packages/acs-core-docs/www/update-repository.html 21 Aug 2013 10:19:34 -0000 1.17.2.1 +++ openacs-4/packages/acs-core-docs/www/update-repository.html 17 Oct 2013 09:08:35 -0000 1.17.2.2 @@ -11,7 +11,7 @@
For each channel, it'll do an anonymous checkout of packges and contrib/packages, then build .apm files for each package in the checkout.
- The files will be stored on the server's hard drive in the directory specified by the 'repository_dir' variable in the page script, by default "[acs_root_dir]/www/repository/". + The files will be stored on the server's hard drive in the directory specified by the 'repository_dir' variable in the page script, by default "$::acs::rootdir/www/repository/".
If you're on openacs.org, everything should now be fine. Otherwise, you need to move the entire directory tree to openacs.org:/web/openacs/www/repository, replacing what was already there.
This is automated on OpenACS.org by having a dedicated site just for building the repository, invoked with this shell script. Since the page circumvents security checks for ease of use, the entire site is limited to local requests. The script is called daily with a cron job.
#!/bin/sh
Index: openacs-4/packages/acs-core-docs/www/upgrade-4.6.3-to-5.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/upgrade-4.6.3-to-5.html,v
diff -u -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/acs-core-docs/www/upgrade-4.6.3-to-5.html 21 Aug 2013 10:19:34 -0000 1.16.2.1
+++ openacs-4/packages/acs-core-docs/www/upgrade-4.6.3-to-5.html 17 Oct 2013 09:08:35 -0000 1.16.2.2
@@ -23,12 +23,12 @@
psql -f upgrade-5.0.0b3-5.0.0b4.sql $OPENACS_SERVICE_NAME
Upgrade ACS Service Contracts manually:
[$OPENACS_SERVICE_NAME aolserver]$ cd /var/lib/aolserver/ $OPENACS_SERVICE_NAME/packages/acs-service-contracts/sql/postgresql/upgrade
psql -f upgrade-4.7d2-4.7d3.sql $OPENACS_SERVICE_NAME
Load acs-authentication data model.
psql -f /var/lib/aolserver/$OPENACS_SERVICE_NAME/openacs-5/packages/acs-authentication/sql/postgresql/acs-authentication-create.sql $OPENACS_SERVICE_NAME
Load acs-lang data model.
psql -f /var/lib/aolserver/$OPENACS_SERVICE_NAME/packages/acs-lang/sql/postgresql/acs-lang-create.sql $OPENACS_SERVICE_NAME
(This step may overlap with the two previous steps, but I think it's harmless?) Create a file which will be executed on startup which takes care of a few issues with authentication and internationalization: create $OPENACS_SERVICE_NAME/tcl/zzz-postload.tcl containing:
if {![apm_package_installed_p acs-lang]} { -apm_package_install -enable -mount_path acs-lang [acs_root_dir]/packages/acs-lang/acs-lang.info +apm_package_install -enable -mount_path acs-lang $::acs::rootdir/packages/acs-lang/acs-lang.info lang::catalog::import -locales [list "en_US"] } if {![apm_package_installed_p acs-authentication]} { -apm_package_install -enable [acs_root_dir]/packages/acs-authentication/acs-authentication.info +apm_package_install -enable $::acs::rootdir/packages/acs-authentication/acs-authentication.info apm_parameter_register "UsePasswordWidgetForUsername" \ "Should we hide what the user types in the username field, the way we do with the password field? Set Index: openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml,v diff -u -r1.21 -r1.21.12.1 --- openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml 17 Jul 2006 05:38:37 -0000 1.21 +++ openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml 17 Oct 2013 09:08:35 -0000 1.21.12.1 @@ -263,7 +263,7 @@Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml,v diff -u -r1.50.2.3 -r1.50.2.4 --- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml 13 Oct 2013 10:33:55 -0000 1.50.2.3 +++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml 17 Oct 2013 09:08:35 -0000 1.50.2.4 @@ -754,7 +754,7 @@ # Cut the URL off the last item in the context bar if { [llength $context] > 0 } { - set context [lreplace $context end end [lindex [lindex $context end] end]] + set context [lreplace $context end end [lindex $context end end]] } db_multirow -unclobber -extend { category_name tree_name } categories categories { Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml,v diff -u -r1.40 -r1.40.4.1 --- openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml 11 Dec 2010 23:36:32 -0000 1.40 +++ openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml 17 Oct 2013 09:08:35 -0000 1.40.4.1 @@ -235,12 +235,12 @@ - The files will be stored on the server's hard drive in the directory specified by the 'repository_dir' variable in the page script, by default "[acs_root_dir]/www/repository/". + The files will be stored on the server's hard drive in the directory specified by the 'repository_dir' variable in the page script, by default "$::acs::rootdir/www/repository/". (This step may overlap with the two previous steps, but I think it's harmless?) Create a file which will be executed on startup which takes care of a few issues with authentication and internationalization: create $OPENACS_SERVICE_NAME /tcl/zzz-postload.tcl containing:if {![apm_package_installed_p acs-lang]} { -apm_package_install -enable -mount_path acs-lang [acs_root_dir]/packages/acs-lang/acs-lang.info +apm_package_install -enable -mount_path acs-lang $::acs::rootdir/packages/acs-lang/acs-lang.info lang::catalog::import -locales [list "en_US"] } if {![apm_package_installed_p acs-authentication]} { -apm_package_install -enable [acs_root_dir]/packages/acs-authentication/acs-authentication.info +apm_package_install -enable $::acs::rootdir/packages/acs-authentication/acs-authentication.info apm_parameter_register "UsePasswordWidgetForUsername" \ "Should we hide what the user types in the username field, the way we do with the password field? Set