[geany/geany] 999e91: Windows: Ignore package signatures on bundle creation

Enrico Tröger git-noreply at xxxxx
Sat Oct 9 10:05:59 UTC 2021


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:      999e918b6c10e1d86b66cdc6a01dccec3772e486
             https://github.com/geany/geany/commit/999e918b6c10e1d86b66cdc6a01dccec3772e486

Log Message:
-----------
Windows: Ignore package signatures on bundle creation


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

Modified: scripts/gtk-bundle-from-msys2.sh
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -104,6 +104,8 @@ handle_command_line_options() {
 }
 
 set -e  # stop on errors
+# enable extended globbing as we need it in _getpkg
+shopt -s extglob
 
 initialize() {
 	if [ -z "$cachedir" ]; then
@@ -135,7 +137,8 @@ _getpkg() {
 	if [ "$use_cache" = "yes" ]; then
 		package_info=$(pacman -Qi mingw-w64-$ABI-$1)
 		package_version=$(echo "$package_info" | grep "^Version " | cut -d':' -f 2 | tr -d '[[:space:]]')
-		ls $cachedir/mingw-w64-${ABI}-${1}-${package_version}-* | sort -V | tail -n 1
+		# 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}



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


More information about the Commits mailing list