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.186 -r1.189.2.187 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 28 Jul 2024 17:41:05 -0000 1.189.2.186 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 29 Jul 2024 12:01:29 -0000 1.189.2.187 @@ -4211,13 +4211,14 @@ @author Gustaf Neumann } { # - # Keys in resource_info: + # Relevant keys in resource_info: # - # "resourceDir" is the absolute path in the filesystem - # "versionSegment" is the optional version-specific element both in the - # URL and in the filesystem. + # "configuredVersion" the version we care about + # "resourceDir" is the absolute path in the filesystem + # "versionSegment" is the optional version-specific element both in the + # URL and in the filesystem. # - set version [dict get $resource_info installedVersion] + set version [dict get $resource_info configuredVersion] set resource_dir [dict get $resource_info resourceDir] if {$version_segment eq "" && [dict exists $resource_info versionSegment]} { @@ -4226,10 +4227,9 @@ set version_segment $version } ns_log notice "::util::resources::download" version $version resource_dir $resource_dir version_segment $version_segment - set can_install [::util::resources::can_install_locally \ - -resource_info $resource_info \ - -version_segment $version_segment] - if {!$can_install} { + if {![::util::resources::can_install_locally \ + -resource_info $resource_info \ + -version_segment $version_segment]} { error "Cannot download resources to $resource_dir due to permissions" } @@ -4262,8 +4262,7 @@ [dict get $resource_info jsFiles] \ [dict get $resource_info extraFiles] \ ] { - - ns_log notice "::util::resources::download $download_prefix/$file" + ns_log notice "... downloading single file: $download_prefix/$file" set result [download_helper -url $download_prefix/$file] #ns_log notice "... returned status code [dict get $result status]" set fn [dict get $result file] @@ -4306,6 +4305,7 @@ # downloaders, which might call this function. # foreach url [dict get $resource_info downloadURLs] { + ns_log notice "... downloading from URL: $url" set result [download_helper -url $url] set fn [dict get $result file] set file [ad_file tail $url] @@ -4322,7 +4322,7 @@ return [expr { [dict exists $resource_info versionSegment] ? [dict get $resource_info versionSegment] - : [dict get $resource_info installedVersion] + : [dict get $resource_info configuredVersion] }] } @@ -4380,7 +4380,7 @@ set versionCheckAPI [dict get $resource_info versionCheckAPI] dict with resource_info { set library [dict get $versionCheckAPI library] - #ns_log notice ... versionCheckAPI $versionCheckAPI installedVersion $installedVersion + #ns_log notice ... versionCheckAPI $versionCheckAPI configuredVersion $configuredVersion if {[dict get $versionCheckAPI cdn] eq "cdnjs"} { set url [::util::resources::cdnjs_version_API \ -library $library \ 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.36 -r1.13.2.37 --- openacs-4/packages/boomerang/tcl/boomerang-procs.tcl 28 Jul 2024 17:41:06 -0000 1.13.2.36 +++ openacs-4/packages/boomerang/tcl/boomerang-procs.tcl 29 Jul 2024 12:01:29 -0000 1.13.2.37 @@ -546,7 +546,7 @@ downloadURLs https://github.com/akamai/boomerang/archive/refs/tags/1.737.0.tar.gz \ cspMap {} \ urnMap {} \ - installedVersion $version + configuredVersion $version return $result } 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.4 -r1.2.2.5 --- openacs-4/packages/boomerang/www/sitewide-admin/index.tcl 28 Jul 2024 12:15:01 -0000 1.2.2.4 +++ openacs-4/packages/boomerang/www/sitewide-admin/index.tcl 29 Jul 2024 12:01:29 -0000 1.2.2.5 @@ -9,7 +9,7 @@ set resource_prefix [acs_package_root_dir boomerang/www/resources] set version_info [::boomerang::version_info] -set version [dict get $resource_info installedVersion] +set version [dict get $resource_info configuredVersion] # # Get version info about the resource files of this package. If not # locally installed, offer a link for download. 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.14 -r1.1.2.15 --- openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.14 +++ openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.15 @@ -102,7 +102,7 @@ cspMap $cspMap \ urnMap {} \ versionCheckAPI {cdn cdnjs library bootstrap-icons count 1} \ - installedVersion $version + configuredVersion $version return $result } 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.3 -r1.1.2.4 --- openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl 28 Jul 2024 12:15:01 -0000 1.1.2.3 +++ openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.4 @@ -6,7 +6,7 @@ } set resource_info [::bootstrap_icons::resource_info] -set version [dict get $resource_info installedVersion] +set version [dict get $resource_info configuredVersion] set download_url [ad_conn url]/download set title "[dict get $resource_info resourceName] - Sitewide Admin" Index: openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl,v diff -u -r1.12.2.15 -r1.12.2.16 --- openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl 28 Jul 2024 17:41:06 -0000 1.12.2.15 +++ openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl 29 Jul 2024 12:01:29 -0000 1.12.2.16 @@ -332,7 +332,7 @@ extraFiles {} \ versionCheckAPI {cdn cdnjs library cookieconsent2 count 5} \ vulnerabilityCheck {service snyk library cookieconsent2} \ - installedVersion $version + configuredVersion $version return $result } 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.2 -r1.6.2.3 --- openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl 28 Jul 2024 12:15:01 -0000 1.6.2.2 +++ openacs-4/packages/cookie-consent/www/sitewide-admin/index.tcl 29 Jul 2024 12:01:29 -0000 1.6.2.3 @@ -6,7 +6,7 @@ } set resource_info [::cookieconsent::resource_info] -set version [dict get $resource_info installedVersion] +set version [dict get $resource_info configuredVersion] 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.10 -r1.1.2.11 --- openacs-4/packages/fa-icons/tcl/resource-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.10 +++ openacs-4/packages/fa-icons/tcl/resource-procs.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.11 @@ -90,7 +90,7 @@ cspMap $cspMap \ urnMap {} \ versionCheckAPI {cdn cdnjs library font-awesome count 5} \ - installedVersion $version + configuredVersion $version return $result } @@ -109,7 +109,7 @@ # If no version is specified, use the version from resouce_info # if {$version eq ""} { - set version [dict get $resource_info installedVersion] + set version [dict get $resource_info configuredVersion] } ::util::resources::download -resource_info $resource_info 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.3 -r1.1.2.4 --- openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl 28 Jul 2024 12:15:01 -0000 1.1.2.3 +++ openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.4 @@ -6,7 +6,7 @@ } set resource_info [::fa_icons::resource_info] -set version [dict get $resource_info installedVersion] +set version [dict get $resource_info configuredVersion] 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.16 -r1.1.2.17 --- openacs-4/packages/highcharts/tcl/resource-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.16 +++ openacs-4/packages/highcharts/tcl/resource-procs.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.17 @@ -94,7 +94,7 @@ urnMap {} \ versionCheckAPI {cdn cdnjs library highcharts count 5} \ vulnerabilityCheck {service snyk library highcharts} \ - installedVersion $version + configuredVersion $version return $result } 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.2 -r1.1.2.3 --- openacs-4/packages/highcharts/www/sitewide-admin/index.tcl 28 Jul 2024 12:15:01 -0000 1.1.2.2 +++ openacs-4/packages/highcharts/www/sitewide-admin/index.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.3 @@ -6,7 +6,7 @@ } set resource_info [::highcharts::resource_info] -set version [dict get $resource_info installedVersion] +set version [dict get $resource_info configuredVersion] set download_url download?version=$version set title "[dict get $resource_info resourceName] Package - Sitewide Admin" Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl,v diff -u -r1.5.2.10 -r1.5.2.11 --- openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 28 Jul 2024 17:41:06 -0000 1.5.2.10 +++ openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 29 Jul 2024 12:01:29 -0000 1.5.2.11 @@ -45,7 +45,7 @@ urn:ad:js:bootstrap3 js/bootstrap.min.js } \ vulnerabilityCheck {service snyk library bootstrap} \ - installedVersion $version + configuredVersion $version if {$cdnHost ne ""} { lappend result cspMap [subst { 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.2 -r1.3.2.3 --- openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl 28 Jul 2024 12:15:01 -0000 1.3.2.2 +++ openacs-4/packages/openacs-bootstrap3-theme/www/sitewide-admin/index.tcl 29 Jul 2024 12:01:29 -0000 1.3.2.3 @@ -6,7 +6,7 @@ } set resource_info [::openacs_bootstrap3_theme::resource_info] -set version [dict get $resource_info installedVersion] +set version [dict get $resource_info configuredVersion] 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.17 -r1.1.2.18 --- openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.17 +++ openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.18 @@ -58,7 +58,7 @@ } \ versionCheckAPI {cdn cdnjs library bootstrap count 1} \ vulnerabilityCheck {service snyk library bootstrap} \ - installedVersion $version + configuredVersion $version #urn:ad:js:popper2 dist/umd/popper.min.js 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.2 -r1.1.2.3 --- openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/index.tcl 28 Jul 2024 12:15:01 -0000 1.1.2.2 +++ openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/index.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.3 @@ -6,7 +6,7 @@ } set resource_info [::openacs_bootstrap5_theme::resource_info] -set version [dict get $resource_info installedVersion] +set version [dict get $resource_info configuredVersion] 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.31 -r1.14.2.32 --- openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 28 Jul 2024 17:41:06 -0000 1.14.2.31 +++ openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 29 Jul 2024 12:01:29 -0000 1.14.2.32 @@ -262,7 +262,7 @@ } \ versionCheckAPI {cdn cdnjs library ckeditor count 20} \ vulnerabilityCheck {service snyk library ckeditor4} \ - installedVersion $version \ + configuredVersion $version \ return $result } 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.5 -r1.3.2.6 --- openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl 28 Jul 2024 12:15:01 -0000 1.3.2.5 +++ openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl 29 Jul 2024 12:01:29 -0000 1.3.2.6 @@ -10,7 +10,7 @@ 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 version [dict get $resource_info configuredVersion] set download_url [ad_conn url]/download?ck_package=$ck_package 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.6 -r1.4.2.7 --- openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl 28 Jul 2024 17:41:06 -0000 1.4.2.6 +++ openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl 29 Jul 2024 12:01:29 -0000 1.4.2.7 @@ -193,7 +193,7 @@ extraFiles {} \ downloadURLs https://s3-us-west-1.amazonaws.com/xinha/releases/xinha-$version.zip \ urnMap {} \ - installedVersion $version + configuredVersion $version return $result } Index: openacs-4/packages/xowiki/tcl/resource-info-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/resource-info-procs.tcl,v diff -u -r1.1.2.8 -r1.1.2.9 --- openacs-4/packages/xowiki/tcl/resource-info-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.8 +++ openacs-4/packages/xowiki/tcl/resource-info-procs.tcl 29 Jul 2024 12:01:29 -0000 1.1.2.9 @@ -47,7 +47,7 @@ urn:ad:js:bootstrap3-treeview bootstrap-treeview.min.js } \ versionCheckAPI {cdn cdnjs library bootstrap-treeview count 1} \ - installedVersion $version + configuredVersion $version if {$cdnHost ne ""} { lappend result csp_lists [subst {