fix

humbletim · Jun 3, 2024 · d0bae37 · d0bae37
1 parent bd946fb
commit d0bae37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/util/_utils.sh b/util/_utils.sh
@@ -27,9 +27,12 @@ function _relativize() {
     local rel="$@" x=
     for x in build_dir source_dir root_dir ghash gha_fsvr_dir fsvr_dir fsvr_cache_dir nunja_dir p373r_dir openvr_dir ; do
       test ! -v $x || {
-        local y="$( echo "${!x}" | tr '\\' '/' )"
-	rel=${rel//${!x}/\{${x}\}}
-	rel=${rel//${y}/\{${x}\}}
+        local y="${!x}"
+        local z="$( echo "${y[@]}" | tr '\\\\' '/' )"
+        local w="$( echo "${z[@]}" | tr '/' '\\\\' )"
+      	rel="${rel//${y[@]}/\{${x}\}}"
+        rel="${rel//${z[@]}/\{${x}\}}"
+        rel="${rel//${w[@]}/\{${x}\}}"
       }
     done
     echo $rel

diff --git a/util/build.sh b/util/build.sh
@@ -302,7 +302,7 @@ function 0b1_upload_installer() {( $_dbgopts;
   mkdir dist
   ht-ln $Installer dist/$InstallerExe
 
-  ( cd dist && gha-upload-artifact ${InstallerExe/.exe/} $InstallerExe )
+  ( cd dist && gha-upload-artifact-fast ${InstallerExe/.exe/} $InstallerExe 2)
 )}
 
 
@@ -317,7 +317,7 @@ function 0b3_upload_7z() {( $_dbgopts;
   mkdir dist || true
   ht-ln $Portable dist/$PortableArchive
 
-  ( cd dist && gha-upload-artifact ${PortableArchive/.7z/} $PortableArchive )
+  ( cd dist && gha-upload-artifact-fast ${PortableArchive/.7z/} $PortableArchive 2)
 )}
 
 function 0b4_bundle_zip() {( $_dbgopts;