about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_mkdir14
2 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 01fe41838..4af9acfe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-04  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 41620 (tweaked per 41622): Completion/Unix/Command/_mkdir:
+	Don't offer a linux-specific option in the 'zsh' variant.
+
 2017-09-04  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 41637: Marc Aldorasi: Completion/Unix/Command/_objdump:
diff --git a/Completion/Unix/Command/_mkdir b/Completion/Unix/Command/_mkdir
index f2299f7c7..afa9cc1f8 100644
--- a/Completion/Unix/Command/_mkdir
+++ b/Completion/Unix/Command/_mkdir
@@ -9,14 +9,6 @@ args=(
   '(-)*: :->directories'
 )
 
-case "$OSTYPE" in
-  linux*)
-    args+=(
-      '(-Z --context)'{-Z,--context=}'[set SELinux context]:SELinux context'
-    )
-  ;;
-esac
-
 _pick_variant -r variant gnu=gnu zsh='\(eval\)' $OSTYPE --help
 # It can still happen that there is a precommand command or builtin in the line.
 # In such cases, the variant has to be modified suitably, after further checking
@@ -41,13 +33,17 @@ case $variant in
     )
   ;|
   gnu)
+    if [[ $OSTYPE == linux* ]]; then
+      args+=(
+        '(-Z --context)'{-Z,--context=}'[set SELinux context]:SELinux context'
+      )
+    fi
     args+=(
       '(- :)--help[display help information]'
       '(- :)--version[display version information]'
     )
   ;;
   zsh) # remove all options
-    args=( '*: :->directories' )
   ;;
   *) # non-GNU: remove long options
     args=( ${${${args:#(|*\))--*}//--[^ )]#/}/\( #\)/} )