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.5 -r1.3.2.6 --- openacs-4/packages/acs-tcl/lib/check-installed.tcl 23 Jul 2024 12:50:32 -0000 1.3.2.5 +++ openacs-4/packages/acs-tcl/lib/check-installed.tcl 24 Jul 2024 13:25:40 -0000 1.3.2.6 @@ -11,18 +11,26 @@ } { {resource_info} {version ""} - {download_url "download"} + {download_url ""} } set resource_dir [dict get $resource_info resourceDir] set cdn [dict get $resource_info cdn] set resource_name [dict get $resource_info resourceName] +if {$download_url eq ""} { + set download_url [ad_conn url]/download +} + set version_dir [::util::resources::version_dir \ -resource_info $resource_info \ -version $version] -if {[dict exists $resource_info versionCheckURL]} { - set versionCheckURL [dict get $resource_info versionCheckURL] +set newest_version [::util::resources::cdnjs_get_newest_version -resource_info $resource_info] + +foreach url {versionCheckURL vulnerabilityCheckURL} { + if {[dict exists $resource_info $url]} { + set $url [dict get $resource_info $url] + } } # @@ -42,8 +50,9 @@ # Check, if we can install the resources locally. # set writable [util::resources::can_install_locally \ - -resource_info $resource_info \ - -version_dir $version_dir] + -resource_info $resource_info \ + -version_dir $version_dir] + if {!$writable} { # # If we cannot install locally, tell the user were we want to