about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2018-04-05 10:27:45 +0900
committerJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2018-04-05 10:27:45 +0900
commite9a76d392449801456c4b47733f187d219477786 (patch)
treeda3543581a1da79547108c937fe3162a8af80ca7
parentf027f1d6e876708bc75d4217e1ca26898658d8d3 (diff)
downloadzsh-e9a76d392449801456c4b47733f187d219477786.tar.gz
zsh-e9a76d392449801456c4b47733f187d219477786.tar.xz
zsh-e9a76d392449801456c4b47733f187d219477786.zip
42577: fix macOS support in _strings
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Command/_strings4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c34e293e..0ff97d936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-05  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+
+	* 42577: Completion/Unix/Command/_strings: fix macOS support
+
 2018-04-04  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: 5.4.2-test-2.
diff --git a/Completion/Unix/Command/_strings b/Completion/Unix/Command/_strings
index 8eeff704b..b13366dd2 100644
--- a/Completion/Unix/Command/_strings
+++ b/Completion/Unix/Command/_strings
@@ -56,9 +56,9 @@ else
     '-a[look everywhere in file, not just initialised data space of object files]'
   )
   case $OSTYPE in
-    darwin)
+    darwin*)
       local -a arch
-      arch=( ${${${"$(_call_program architectures strings -arch \? 2>&1)"}#*flags are: }%%$'\n'*} )
+      arch=( ${(z)${${"$(_call_program architectures strings -arch - 2>&1)"}#*flags are: }%%$'\n'*} all )
       args+=( '-arch[specify the architecture]:architecture:compadd -a arch' )
     ;;
   esac