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 } }