You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
20 lines
598 B
20 lines
598 B
env.eselect: More robust file type detection
|
|
https://bugs.gentoo.org/908401
|
|
|
|
--- a/modules/env.eselect
|
|
+++ b/modules/env.eselect
|
|
@@ -46,9 +46,10 @@ is_envfile() {
|
|
[[ -n ${envfile##*~} ]] || return 1
|
|
[[ ${envfile##*.} != bak ]] || return 1
|
|
|
|
- mime=$(POSIXLY_CORRECT=1 file -i "${envfile}" \
|
|
- | cut -d ' ' -f 2 | sed -e 's/;$//')
|
|
- if ! has ${mime} ${MIME_WHITELIST}; then
|
|
+ mime=$(POSIXLY_CORRECT=1 file -bi -e soft "${envfile}") \
|
|
+ || die "'file' command failed"
|
|
+ mime=${mime%%;*}
|
|
+ if ! has "${mime}" ${MIME_WHITELIST}; then
|
|
echo "Skipping non-text file ${envfile}."
|
|
return 1
|
|
fi
|