aboutsummaryrefslogtreecommitdiff
path: root/msys2-configure.sh
diff options
context:
space:
mode:
authorPřemysl Eric Janouch <p@janouch.name>2024-04-06 20:41:06 +0200
committerPřemysl Eric Janouch <p@janouch.name>2024-04-06 23:56:47 +0200
commite57364cd979a9f57f08c023621b999eddd379a45 (patch)
tree39c6fac745f1b3e0d9bea62b7749322068f7886e /msys2-configure.sh
parent7330f07dd763237b2cf22ee23528cc55541428f0 (diff)
downloadfiv-e57364cd979a9f57f08c023621b999eddd379a45.tar.gz
fiv-e57364cd979a9f57f08c023621b999eddd379a45.tar.xz
fiv-e57364cd979a9f57f08c023621b999eddd379a45.zip
Fix openSUSE 15.5 and Win32 builds
Diffstat (limited to 'msys2-configure.sh')
-rwxr-xr-xmsys2-configure.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/msys2-configure.sh b/msys2-configure.sh
index 2f43d0d..7b7724e 100755
--- a/msys2-configure.sh
+++ b/msys2-configure.sh
@@ -75,10 +75,15 @@ extract() {
--exclude '*/share/man' --exclude '*/share/doc'
done < db.want
- bsdtar -xf exiftool.tar.gz
- mv Image-ExifTool-*/exiftool bin
- mv Image-ExifTool-*/lib/* lib/perl5/site_perl
- rm -rf Image-ExifTool-*
+ # Don't require Perl, which may not exist anymore on i686:
+ # https://github.com/msys2/MINGW-packages/pull/20085
+ if [ -d lib/perl5 ]
+ then
+ bsdtar -xf exiftool.tar.gz
+ mv Image-ExifTool-*/exiftool bin
+ mv Image-ExifTool-*/lib/* lib/perl5/site_perl
+ rm -rf Image-ExifTool-*
+ fi
}
configure() {