index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Eli Schwartz <eschwartz@archlinux.org> | 2019-08-11 23:46:25 -0400 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2019-10-07 13:43:37 +1000 |
commit | de6249ce221aae4062ea131d4f676f7e3d44af28 (patch) | |
tree | 42c10fed40bc0fe591c8e38fb136afd433e00bf5 /scripts | |
parent | 2a792ac7bb1ceda42767c696e2664819b47ffc3b (diff) |
-rw-r--r-- | scripts/Makefile.am | 1 | ||||
-rw-r--r-- | scripts/libmakepkg/source/file.sh.in | 2 |
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index ea72f21e..7b6cd00c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -182,6 +182,7 @@ edit = sed \ -e 's|@TEMPLATE_DIR[@]|$(TEMPLATE_DIR)|g' \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ + -e "s|@FILECMD[@]|$(FILECMD)|g" \ -e 's|@SEDINPLACEFLAGS[@]|$(SEDINPLACEFLAGS)|g' \ -e 's|@SEDPATH[@]|$(SEDPATH)|g' \ -e 's|@SCRIPTNAME[@]|$@|g' \ diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 8492ba11..f6d79f9e 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -96,7 +96,7 @@ extract_file() { fi # do not rely on extension for file type - local file_type=$(file -bizL -- "$file") + local file_type=$(@FILECMD@ -bizL -- "$file") local ext=${file##*.} local cmd='' case "$file_type" in |