Index: openacs-4/packages/openacs-bootstrap5-theme/openacs-bootstrap5-theme.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/openacs-bootstrap5-theme.info,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/openacs-bootstrap5-theme/openacs-bootstrap5-theme.info	7 Aug 2022 12:56:10 -0000	1.1.2.2
+++ openacs-4/packages/openacs-bootstrap5-theme/openacs-bootstrap5-theme.info	11 Aug 2022 13:51:38 -0000	1.1.2.3
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>f</inherit-templates-p>
     
-    <version name="5.10.1d1" url="http://openacs.org/repository/download/apm/openacs-bootstrap5-theme-5.10.1d1.apm">
+    <version name="5.10.1d2" url="http://openacs.org/repository/download/apm/openacs-bootstrap5-theme-5.10.1d2.apm">
         <owner url="mailto:manderga@wu.ac.at">manderga</owner>
         <owner url="mailto:neumann@wu.ac.at">Gustaf Neumann</owner>
         <summary>Theme for OpenACS based on Twitter Bootstrap 5</summary>
@@ -23,8 +23,8 @@
         <license>GPL version 2</license>
         <maturity>2</maturity>
 
-        <provides url="openacs-bootstrap5-theme" version="5.10.1d1"/>
-	<requires url="acs-tcl" version="5.10.0"/>
+        <provides url="openacs-bootstrap5-theme" version="5.10.1d2"/>
+	<requires url="acs-tcl" version="5.10.1d19"/>
         <requires url="acs-kernel" version="5.10.0"/>
         <requires url="acs-subsite" version="5.10.0"/>
         <requires url="bootstrap-icons" version="0.2d0"/>
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.3 -r1.1.2.4
--- openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl	7 Aug 2022 12:56:10 -0000	1.1.2.3
+++ openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl	11 Aug 2022 13:51:38 -0000	1.1.2.4
@@ -3,45 +3,52 @@
 
     ad_proc -private ::openacs_bootstrap5_theme::resource_info {} {
 
-	Get information about available version(s) of the bootstrap
-	packages. The goal is to deliver resources either from the
-	local filesystem, or from CDN.
+        Get information about available version(s) of the bootstrap
+        packages. The goal is to deliver resources either from the
+        local filesystem, or from CDN.
 
-	@return dict containing resourceDir, resourceName, cdn,
-		cdnHost, prefix, cssFiles, jsFiles and extraFiles.
+        @return dict containing resourceDir, resourceName, cdn,
+                cdnHost, prefix, cssFiles, jsFiles and extraFiles.
 
     } {
-	#
-	# Provide paths for loading either via /resources/ or CDN
-	#
-	set resourceDir [acs_package_root_dir openacs-bootstrap5-theme/www/resources/bootstrap]
-	set resourceUrl /resources/openacs-bootstrap5-theme/bootstrap
-        set cdnHost    cdn.jsdelivr.net
-	set cdn         //$cdnHost/npm
-	set version     $openacs_bootstrap5_theme::bootstrap_version
+        #
+        # Provide paths for loading either via /resources/ or CDN
+        #
+        #   "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
+        #                URL and in the filesystem.
+        #
+        set resourceDir   [acs_package_root_dir openacs-bootstrap5-theme/www/resources/bootstrap]
+        set resourceUrl   /resources/openacs-bootstrap5-theme/bootstrap
+        set cdnHost       cdn.jsdelivr.net
+        set cdn           //$cdnHost/npm
+        set version       $openacs_bootstrap5_theme::bootstrap_version
+        set versionDir    bootstrap@$version/dist
 
-	if {[file exists $resourceDir/$version]} {
-	    set prefix  $resourceUrl/$version
-	    set cdnHost ""
-	} else {
+        if {[file exists $resourceDir/$versionDir]} {
+            set prefix $resourceUrl/$versionDir
+            set cdnHost ""
+        } else {
             # https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css
-            # https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js            
-	    set prefix $cdn/bootstrap@$version/dist
-	}
+            # https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js
+            set prefix $cdn/$versionDir
+        }
 
-	lappend result \
-	    resourceName "Bootstrap 5" \
-	    resourceDir $resourceDir \
-	    cdn $cdn \
-	    cdnHost $cdnHost \
-	    prefix $prefix \
-	    cssFiles {css/bootstrap.min.css} \
-	    jsFiles  {js/bootstrap.bindle.min.js dist/umd/popper.min.js} \
-	    extraFiles {} \
-	    urnMap {
-		urn:ad:css:bootstrap5 css/bootstrap.min.css
-		urn:ad:js:bootstrap5  js/bootstrap.bundle.min.js
-	    }
+        lappend result \
+            resourceName "Bootstrap 5" \
+            resourceDir $resourceDir \
+            versionDir $versionDir \
+            cdn $cdn \
+            cdnHost $cdnHost \
+            prefix $prefix \
+            cssFiles {css/bootstrap.min.css} \
+            jsFiles  {js/bootstrap.bundle.min.js} \
+            extraFiles {} \
+            urnMap {
+                urn:ad:css:bootstrap5 css/bootstrap.min.css
+                urn:ad:js:bootstrap5  js/bootstrap.bundle.min.js
+            }
         #urn:ad:js:popper2     dist/umd/popper.min.js
 
         if {$cdnHost ne ""} {
@@ -53,12 +60,9 @@
                 urn:ad:js:bootstrap5 {
                     script-src $cdnHost
                 }
-                urn:ad:js:popper2 {
-                    script-src $cdnHost
-                }
             }]
         }
-	return $result
+        return $result
     }
 }
 
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.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/download.tcl	1 Apr 2022 13:38:23 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/www/sitewide-admin/download.tcl	11 Aug 2022 13:51:38 -0000	1.1.2.2
@@ -10,7 +10,6 @@
     set version $::openacs_bootstrap5_theme::bootstrap_version
 }
 ::util::resources::download \
-    -version_dir $version \
     -resource_info [::openacs_bootstrap5_theme::resource_info]
 
 ad_returnredirect .