msys2-configure.sh

@@ -46,8 +46,7 @@ fetch() {
 	} BEGIN { while ((getline < "db.tsv") > 0) {
 		filenames[$1] = $2; deps[$1] = ""; for (i = 3; i <= NF; i++) {
 			gsub(/[<=>].*/, "", $i); deps[$1] = deps[$1] $i FS }
-	} for (i = 0; i < ARGC; i++) get(ARGV[i]) }' "$@" | tee db.want | \
-	while IFS= read -r name
+	} for (i = 0; i < ARGC; i++) get(ARGV[i]) }' "$@" | while IFS= read -r name
 	do
 		status Fetching "$name"
 		[ -f "packages/$name" ] || curl -#o "packages/$name" "$repo/$name"
@@ -70,10 +69,10 @@ extract() {
 	for subdir in *
 	do [ -d "$subdir" -a "$subdir" != packages ] && rm -rf -- "$subdir"
 	done
-	while IFS= read -r name
-	do bsdtar -xf "packages/$name" --strip-components 1 \
+	for i in packages/*
+	do bsdtar -xf "$i" --strip-components 1 \
 		--exclude '*/share/man' --exclude '*/share/doc'
-	done < db.want
+	done
 
 	bsdtar -xf exiftool.tar.gz
 	mv Image-ExifTool-*/exiftool bin
@@ -136,7 +135,7 @@ msys2_root=$builddir$prefix
 mkdir -p "$msys2_root"
 cd "$msys2_root"
 dbsync
-fetch $pkg-gtk3 $pkg-lcms2 $pkg-libraw $pkg-libheif $pkg-libjxl $pkg-perl \
+fetch $pkg-gtk3 $pkg-lcms2 $pkg-libraw $pkg-libheif $pkg-perl \
 	$pkg-perl-win32-api $pkg-libwinpthread-git # Because we don't do "provides"?
 verify
 extract