Index: openacs-4/packages/acs-tcl/lib/check-installed.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/check-installed.tcl,v
diff -u -r1.3.2.7 -r1.3.2.8
--- openacs-4/packages/acs-tcl/lib/check-installed.tcl	25 Jul 2024 14:24:26 -0000	1.3.2.7
+++ openacs-4/packages/acs-tcl/lib/check-installed.tcl	28 Jul 2024 12:15:00 -0000	1.3.2.8
@@ -21,10 +21,7 @@
     set download_url [ad_conn url]/download
 }
 
-set version_dir [::util::resources::version_dir \
-                     -resource_info $resource_info \
-                     -version $version]
-
+set version_dir [::util::resources::version_dir -resource_info $resource_info]
 set newest_version [::util::resources::cdnjs_get_newest_version -resource_info $resource_info]
 
 #
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.189.2.183 -r1.189.2.184
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	25 Jul 2024 14:24:26 -0000	1.189.2.183
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	28 Jul 2024 12:15:00 -0000	1.189.2.184
@@ -4071,14 +4071,18 @@
     } {
 
         Check, if the required resource files are installed locally.
-        When the version_dir is specified, it is possible to have
-        different versions locally installed.
+        When there should not be a version_dir segment used, provide
+        an empty one via resource_info.
 
         @param resource_info a dict containing resourceDir, cssFiles, jsFiles, and extraFiles
         @param version_dir an optional directory, under the resource directory
 
         @author Gustaf Neumann
     } {
+        if {$version_dir eq ""} {
+            set version_dir [::util::resources::version_dir -resource_info $resource_info]
+        }
+        
         set installed 1
         set resource_dir [dict get $resource_info resourceDir]
         #ns_log notice "check downloadURLs <[dict exists $resource_info downloadURLs]> // [lsort [dict keys $resource_info]]"
@@ -4156,21 +4160,6 @@
         return $can_install
     }
 
-    ad_proc -public ::util::resources::version_dir {
-        {-resource_info:required}
-        {-version_dir ""}
-    } {
-
-        Obtain the version_dir either from the provided string or from
-        the resource_info dict.
-
-    } {
-        if {$version_dir eq "" && [dict exists $resource_info versionDir]} {
-            set version_dir [dict get $resource_info versionDir]
-        }
-        return $version_dir
-    }
-
     ad_proc ::util::resources::download_helper {
         -url
     } {
@@ -4222,16 +4211,22 @@
         @author Gustaf Neumann
     } {
         #
+        # Keys in resource_info:
+        #
         #   "resourceDir" is the absolute path in the filesystem
         #   "resourceUrl" is the URL path provided to the request processor
-        #   "versionDir" is the version-specific element both in the
+        #   "versionDir" is the optional version-specific element both in the
         #                URL and in the filesystem.
+        #
+        set version [dict get $resource_info installedVersion]
+        set resource_dir [dict get $resource_info resourceDir]
 
-        if {$version_dir eq ""} {
+        if {$version_dir eq "" && [dict exists $resource_info versionDir]} {
             set version_dir [dict get $resource_info versionDir]
+        } elseif {$version_dir eq ""} {
+            set version_dir $version
         }
-
-        set resource_dir [dict get $resource_info resourceDir]
+        ns_log notice "::util::resources::download" version $version resource_dir $resource_dir version_dir $version_dir
         set can_install [::util::resources::can_install_locally \
                              -resource_info $resource_info \
                              -version_dir $version_dir]
@@ -4322,14 +4317,13 @@
 
     ad_proc -public ::util::resources::version_dir {
         -resource_info:required
-        -version:required
     } {
         Return the partial directory, where a certain version is/will be installed.
-    } {
+    } {        
         return [expr {
                       [dict exists $resource_info versionDir]
                       ? [dict get $resource_info versionDir]
-                      : $version
+                      : [dict get $resource_info installedVersion]
                   }]
     }
 
Index: openacs-4/packages/boomerang/tcl/boomerang-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/tcl/boomerang-procs.tcl,v
diff -u -r1.13.2.34 -r1.13.2.35
--- openacs-4/packages/boomerang/tcl/boomerang-procs.tcl	10 Jul 2023 09:38:05 -0000	1.13.2.34
+++ openacs-4/packages/boomerang/tcl/boomerang-procs.tcl	28 Jul 2024 12:15:00 -0000	1.13.2.35
@@ -546,7 +546,8 @@
             extraFiles {} \
             downloadURLs https://github.com/akamai/boomerang/archive/refs/tags/1.737.0.tar.gz \
             cspMap {} \
-            urnMap {}
+            urnMap {} \
+            installedVersion $version
 
         return $result
     }
Index: openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl	9 Feb 2020 15:26:10 -0000	1.1.2.1
+++ openacs-4/packages/boomerang/www/sitewide-admin/compress.tcl	28 Jul 2024 12:15:00 -0000	1.1.2.2
@@ -3,7 +3,7 @@
 
     @creation-date Jan 10, 2018
 } {
-    {version:word,notnull ""}
+    {version:token,notnull ""}
 }
 
 set resource_prefix [acs_package_root_dir boomerang/www/resources]
Index: openacs-4/packages/boomerang/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/www/sitewide-admin/index.tcl,v
diff -u -r1.2.2.3 -r1.2.2.4
--- openacs-4/packages/boomerang/www/sitewide-admin/index.tcl	19 Aug 2022 15:03:05 -0000	1.2.2.3
+++ openacs-4/packages/boomerang/www/sitewide-admin/index.tcl	28 Jul 2024 12:15:01 -0000	1.2.2.4
@@ -7,13 +7,13 @@
 set context [list $title]
 
 set resource_prefix [acs_package_root_dir boomerang/www/resources]
-set version $::boomerang::version
 
+set version_info [::boomerang::version_info]
+set version [dict get $resource_info installedVersion]
 #
 # Get version info about the resource files of this package. If not
 # locally installed, offer a link for download.
 #
-set version_info [::boomerang::version_info]
 set prefix [dict get $version_info prefix]
 set jsFile [lindex [dict get $version_info jsFiles] 0]
 set downloadURL [lindex [dict get $version_info downloadURLs] 0]
Index: openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl,v
diff -u -r1.1.2.12 -r1.1.2.13
--- openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl	25 Jul 2024 14:24:26 -0000	1.1.2.12
+++ openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.13
@@ -55,9 +55,9 @@
             #
             # Local version is installed
             #
-            set prefix  $resourceUrl/bootstrap-icons-$::bootstrap_icons::version
+            set prefix  $resourceUrl/bootstrap-icons-$version
             set cdnHost ""
-            set cspMap ""
+            set cspMap  ""
         } else {
             #
             # Use CDN
@@ -123,9 +123,7 @@
         }
 
         set resource_info [resource_info -version $version]
-        ::util::resources::download \
-            -resource_info $resource_info \
-            -version_dir $version
+        ::util::resources::download -resource_info $resource_info
 
         set resourceDir [dict get $resource_info resourceDir]
         ns_log notice " ::bootstrap_icons::download resourceDir $resourceDir"
Index: openacs-4/packages/bootstrap-icons/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bootstrap-icons/www/sitewide-admin/download.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/bootstrap-icons/www/sitewide-admin/download.tcl	1 Apr 2022 13:04:44 -0000	1.1.2.1
+++ openacs-4/packages/bootstrap-icons/www/sitewide-admin/download.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.2
@@ -3,7 +3,7 @@
 
     @creation-date Jan 04, 2017
 } {
-    {version:word,notnull ""}
+    {version:token,notnull ""}
 }
 
 ::bootstrap_icons::download -version $version
Index: openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl	24 Jul 2024 16:31:45 -0000	1.1.2.2
+++ openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.3
@@ -5,8 +5,8 @@
 } {
 }
 
-set version $::bootstrap_icons::version
 set resource_info [::bootstrap_icons::resource_info]
+set version [dict get $resource_info installedVersion]
 set download_url [ad_conn url]/download
 
 set title "[dict get $resource_info resourceName] - Sitewide Admin"
Index: openacs-4/packages/cookie-consent/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/www/sitewide-admin/download.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/cookie-consent/www/sitewide-admin/download.tcl	9 Feb 2020 15:34:41 -0000	1.2.2.1
+++ openacs-4/packages/cookie-consent/www/sitewide-admin/download.tcl	28 Jul 2024 12:15:01 -0000	1.2.2.2
@@ -3,15 +3,11 @@
 
     @creation-date Dec 13, 2017
 } {
-    {version:word,notnull ""}
+    {version:token,notnull ""}
 }
 
-if {$version eq ""} {
-    set version $::cookieconsent::version
-}
 ::util::resources::download \
-    -version_dir $version \
-    -resource_info [::cookieconsent::resource_info]
+    -resource_info [::cookieconsent::resource_info -version $version]
 
 ad_returnredirect .
 
Index: openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl	9 Feb 2020 15:34:41 -0000	1.6.2.1
+++ openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl	28 Jul 2024 12:15:01 -0000	1.6.2.2
@@ -5,8 +5,8 @@
 } {
 }
 
-set version $::cookieconsent::version
 set resource_info [::cookieconsent::resource_info]
+set version [dict get $resource_info installedVersion]
 
 set title "[dict get $resource_info resourceName] - Sitewide Admin"
 set context [list $title]
Index: openacs-4/packages/fa-icons/tcl/resource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fa-icons/tcl/resource-procs.tcl,v
diff -u -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/fa-icons/tcl/resource-procs.tcl	25 Jul 2024 14:24:26 -0000	1.1.2.8
+++ openacs-4/packages/fa-icons/tcl/resource-procs.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.9
@@ -103,17 +103,17 @@
         into a directory structure similar to the CDN to support the
         installation of multiple versions.
     } {
+
+        set resource_info [resource_info -version $version]
+        
         #
-        # If no version is specified, use the namespaced variable.
+        # If no version is specified, use the version from resouce_info
         #
         if {$version eq ""} {
-            set version ${::fa_icons::version}
+            set version [dict get $resource_info installedVersion]
         }
 
-        set resource_info [resource_info -version $version]
-        ::util::resources::download \
-            -resource_info $resource_info \
-            -version_dir $version
+        ::util::resources::download -resource_info $resource_info
 
         set resourceDir [dict get $resource_info resourceDir]
         ns_log notice " ::fa_icons::download resourceDir $resourceDir"
Index: openacs-4/packages/fa-icons/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fa-icons/www/sitewide-admin/download.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/fa-icons/www/sitewide-admin/download.tcl	17 Apr 2022 10:41:37 -0000	1.1.2.1
+++ openacs-4/packages/fa-icons/www/sitewide-admin/download.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.2
@@ -3,7 +3,7 @@
 
     @creation-date April 04, 2022
 } {
-    {version:word,notnull ""}
+    {version:token,notnull ""}
 }
 
 ::fa_icons::download -version $version
Index: openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl	24 Jul 2024 16:31:45 -0000	1.1.2.2
+++ openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.3
@@ -5,8 +5,8 @@
 } {
 }
 
-set version $::fa_icons::version
 set resource_info [::fa_icons::resource_info]
+set version [dict get $resource_info installedVersion]
 set download_url [ad_conn url]/download
 
 set title "[dict get $resource_info resourceName] - Sitewide Admin"
Index: openacs-4/packages/highcharts/tcl/resource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/highcharts/tcl/resource-procs.tcl,v
diff -u -r1.1.2.13 -r1.1.2.14
--- openacs-4/packages/highcharts/tcl/resource-procs.tcl	25 Jul 2024 14:24:26 -0000	1.1.2.13
+++ openacs-4/packages/highcharts/tcl/resource-procs.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.14
@@ -108,20 +108,14 @@
         installation of multiple versions.
     } {
         #
-        # If no version is specified, use the namespaced variable.
+        # Get resource_info for the specified version
         #
-        if {$version eq ""} {
-            set version ${::highcharts::version}
-        }
-
         set resource_info [resource_info -version $version]
-        ::util::resources::download \
-            -resource_info $resource_info \
-            -version_dir $version
-
         set resourceDir [dict get $resource_info resourceDir]
-        ns_log notice " ::highcharts::download resourceDir $resourceDir"
-
+        set versionDir [::util::resources::version_dir -resource_info $resource_info]
+        
+        ::util::resources::download -resource_info $resource_info
+        
         #
         # Do we have unzip installed?
         #
@@ -147,8 +141,8 @@
             set fn [file tail $url]
             util::unzip \
                 -overwrite \
-                -source $resourceDir/$version/$fn \
-                -destination $resourceDir/$version
+                -source $resourceDir/$versionDir/$fn \
+                -destination $resourceDir/$versionDir
         }
     }
 
Index: openacs-4/packages/highcharts/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/highcharts/www/sitewide-admin/download.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/highcharts/www/sitewide-admin/download.tcl	23 Oct 2022 18:41:18 -0000	1.1.2.1
+++ openacs-4/packages/highcharts/www/sitewide-admin/download.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.2
@@ -3,7 +3,7 @@
 
     @creation-date Jan 04, 2017
 } {
-    {version:word,notnull ""}
+    {version:token,notnull ""}
 }
 
 ::highcharts::download -version $version
Index: openacs-4/packages/highcharts/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/highcharts/www/sitewide-admin/index.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/highcharts/www/sitewide-admin/index.tcl	23 Oct 2022 18:41:18 -0000	1.1.2.1
+++ openacs-4/packages/highcharts/www/sitewide-admin/index.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.2
@@ -5,9 +5,9 @@
 } {
 }
 
-set version $::highcharts::version
 set resource_info [::highcharts::resource_info]
-set download_url download
+set version [dict get $resource_info installedVersion]
+set download_url download?version=$version
 
 set title "[dict get $resource_info resourceName] Package - Sitewide Admin"
 set context [list $title]
Index: openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/download.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/download.tcl	9 Feb 2020 15:45:31 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/download.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.2
@@ -3,15 +3,11 @@
 
     @creation-date Aug 1, 2018
 } {
-    {version:word,notnull ""}
+    {version:token,notnull ""}
 }
 
-if {$version eq ""} {
-    set version $::openacs_bootstrap3_theme::bootstrap_version
-}
 ::util::resources::download \
-    -version_dir $version \
-    -resource_info [::openacs_bootstrap3_theme::resource_info]
+    -resource_info [::openacs_bootstrap3_theme::resource_info -version $version]
 
 ad_returnredirect .
 
Index: openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl	9 Feb 2020 15:45:31 -0000	1.3.2.1
+++ openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl	28 Jul 2024 12:15:01 -0000	1.3.2.2
@@ -5,8 +5,8 @@
 } {
 }
 
-set version $::openacs_bootstrap3_theme::bootstrap_version
 set resource_info [::openacs_bootstrap3_theme::resource_info]
+set version [dict get $resource_info installedVersion]
 
 set title "[dict get $resource_info resourceName] - Sitewide Admin"
 set context [list $title]
Index: openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl,v
diff -u -r1.1.2.14 -r1.1.2.15
--- openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl	25 Jul 2024 14:24:26 -0000	1.1.2.14
+++ openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.15
@@ -1,7 +1,11 @@
 namespace eval openacs_bootstrap5_theme {
+    variable bootstrap_version
+    
     set bootstrap_version 5.3.3
 
-    ad_proc -private ::openacs_bootstrap5_theme::resource_info {} {
+    ad_proc -private ::openacs_bootstrap5_theme::resource_info {
+        {-version ""}
+    } {
 
         Get information about available version(s) of the bootstrap
         packages. The goal is to deliver resources either from the
@@ -11,6 +15,11 @@
                 cdnHost, prefix, cssFiles, jsFiles and extraFiles.
 
     } {
+
+        if {$version eq ""} {
+            set version $::openacs_bootstrap5_theme::bootstrap_version
+        }
+        
         #
         # Provide paths for loading either via /resources/ or CDN
         #
@@ -21,7 +30,7 @@
         #
         set resourceDir   [acs_package_root_dir openacs-bootstrap5-theme/www/resources/bootstrap]
         set resourceUrl   /resources/openacs-bootstrap5-theme/bootstrap
-        set version       $openacs_bootstrap5_theme::bootstrap_version
+        
         set versionDir    $version
         set cdn           //cdnjs.cloudflare.com/ajax/libs/bootstrap
 
Index: openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/download.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/download.tcl	11 Aug 2022 13:51:38 -0000	1.1.2.2
+++ openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/download.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.3
@@ -3,14 +3,11 @@
 
     @creation-date Aug 1, 2018
 } {
-    {version:word,notnull ""}
+    {version:token,notnull ""}
 }
 
-if {$version eq ""} {
-    set version $::openacs_bootstrap5_theme::bootstrap_version
-}
 ::util::resources::download \
-    -resource_info [::openacs_bootstrap5_theme::resource_info]
+    -resource_info [::openacs_bootstrap5_theme::resource_info -version $version]
 
 ad_returnredirect .
 
Index: openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/index.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/index.tcl	1 Apr 2022 13:38:23 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/index.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.2
@@ -5,8 +5,8 @@
 } {
 }
 
-set version $::openacs_bootstrap5_theme::bootstrap_version
 set resource_info [::openacs_bootstrap5_theme::resource_info]
+set version [dict get $resource_info installedVersion]
 
 set title "[dict get $resource_info resourceName] - Sitewide Admin"
 set context [list $title]
Index: openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl,v
diff -u -r1.14.2.29 -r1.14.2.30
--- openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl	25 Jul 2024 14:24:26 -0000	1.14.2.29
+++ openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl	28 Jul 2024 12:15:01 -0000	1.14.2.30
@@ -394,9 +394,7 @@
             return
         }
 
-        ::util::resources::download \
-            -resource_info $resource_info \
-            -version_dir $version
+        ::util::resources::download -resource_info $resource_info
 
         set resourceDir [dict get $resource_info resourceDir]
 
Index: openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/download.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/download.tcl	22 Jul 2021 20:11:39 -0000	1.2.2.2
+++ openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/download.tcl	28 Jul 2024 12:15:01 -0000	1.2.2.3
@@ -4,7 +4,7 @@
     @creation-date Jan 04, 2017
 } {
     {ck_package:token,notnull ""}
-    {version:word,notnull ""}
+    {version:token,notnull ""}
 }
 
 ::richtext::ckeditor4::download -ck_package $ck_package -version $version
Index: openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl,v
diff -u -r1.3.2.4 -r1.3.2.5
--- openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl	24 Jul 2024 16:31:45 -0000	1.3.2.4
+++ openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl	28 Jul 2024 12:15:01 -0000	1.3.2.5
@@ -6,12 +6,12 @@
     {ck_package:token ""}
 }
 
-set version $::richtext::ckeditor4::version
-set default_ck_package $::richtext::ckeditor4::ck_package
 if {$ck_package eq ""} {
     set ck_package $::richtext::ckeditor4::ck_package
 }
 set resource_info [::richtext::ckeditor4::resource_info -ck_package $ck_package]
+set version [dict get $resource_info installedVersion]
+
 set download_url [ad_conn url]/download?ck_package=$ck_package
 
 set title "[dict get $resource_info resourceName] - Sitewide Admin"
Index: openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl,v
diff -u -r1.4.2.4 -r1.4.2.5
--- openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl	28 Feb 2022 13:55:08 -0000	1.4.2.4
+++ openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl	28 Jul 2024 12:15:01 -0000	1.4.2.5
@@ -162,7 +162,7 @@
         # namespaced variables as default.
         #
         if {$version eq ""} {
-            set version ${::richtext::xinha::version}
+            set version $::richtext::xinha::version
         }
 
         #
@@ -193,7 +193,8 @@
             jsFiles  {} \
             extraFiles {} \
             downloadURLs https://s3-us-west-1.amazonaws.com/xinha/releases/xinha-$version.zip \
-            urnMap {}
+            urnMap {} \
+            installedVersion $version
 
         return $result
     }
@@ -265,10 +266,7 @@
         set resource_info [::richtext::xinha::resource_info \
                                -version $version]
 
-        ::util::resources::download \
-            -resource_info $resource_info \
-            -version_dir $version
-
+        ::util::resources::download -resource_info $resource_info
         set resourceDir [dict get $resource_info resourceDir]
 
         #
Index: openacs-4/packages/xowiki/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/sitewide-admin/download.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/www/sitewide-admin/download.tcl	31 Jul 2020 17:12:14 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/www/sitewide-admin/download.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.3
@@ -14,9 +14,7 @@
     error "directory $resourceDir/$version is not writable"
 }
 
-::util::resources::download \
-    -resource_info $resource_info \
-    -version_dir $version
+::util::resources::download -resource_info $resource_info
 
 # foreach url [dict get $resource_info downloadURLs] {
 #     set fn [file tail $url]