[geany/geany] 839526: Windows: Ignore Pacman cache on bundle creation

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sat, 09 Oct 2021 10:05:59 UTC
Commit:      8395267fc9f285f49d9dc66fb06abcaf43981593
             https://github.com/geany/geany/commit/8395267fc9f285f49d9dc66fb06abcaf43981593

Log Message:
-----------
Windows: Ignore Pacman cache on bundle creation

Also use long command line arguments for curl to fix a typo in -L.


Modified Paths:
--------------
    scripts/gtk-bundle-from-msys2.sh

Modified: scripts/gtk-bundle-from-msys2.sh
7 lines changed, 4 insertions(+), 3 deletions(-)
===================================================================
@@ -140,8 +140,9 @@ _getpkg() {
 		# use @(gz|xz|zst) to filter out signature files (e.g. mingw-w64-x86_64-...-any.pkg.tar.zst.sig)
 		ls $cachedir/mingw-w64-${ABI}-${1}-${package_version}-*.tar.@(gz|xz|zst) | sort -V | tail -n 1
 	else
-		# -dd to ignore dependencies as we listed them already above in $packages
-		pacman -Sddp mingw-w64-${ABI}-${1}
+		# -dd to ignore dependencies as we listed them already above in $packages and
+		# make pacman ignore its possibly existing cache (otherwise we would get an URL to the cache)
+		pacman -Sddp --cachedir /nonexistent mingw-w64-${ABI}-${1}
 	fi
 }
 
@@ -169,7 +170,7 @@ extract_packages() {
 		else
 			echo "Download $pkg using curl"
 			filename=$(basename "$pkg")
-			curl -s -o "$filename" -l "$pkg"
+			curl --silent --location --output "$filename" "$pkg"
 			tar xf "$filename"
 			rm "$filename"
 		fi



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).