zsh: Sort completions in LC_ALL=C order

Where the order doesn't matter, a deterministic order minimizes
conflicts.

Signed-off-by: Simon McVittie <smcv@collabora.com>

1 files changed, 44 insertions, 42 deletions

diff --git a/completions/zsh/_bwrap b/completions/zsh/_bwrap
index 88c9b35..5217a75 100755
--- a/completions/zsh/_bwrap
+++ b/completions/zsh/_bwrap
@@ -2,57 +2,59 @@
 
 _bwrap_args=(
     '*::arguments:_normal'
-    '--help[Print help and exit]'
-    '--version[Print version]'
+
+    # Please sort alphabetically (in LC_ALL=C order) by option name
     '--args[Parse NUL-separated args from FD]: :'
-    '--unshare-all[Unshare every namespace we support by default]'
-    '(--userns --userns2)--unshare-user[Create new user namespace (may be automatically implied if not setuid)]'
-    '--unshare-user-try[Create new user namespace if possible else continue by skipping it]'
-    '--unshare-ipc[Create new ipc namespace]'
-    '--unshare-pid[Create new pid namespace]'
-    '--unshare-net[Create new network namespace]'
-    '--unshare-uts[Create new uts namespace]'
-    '--unshare-cgroup[Create new cgroup namespace]'
-    '--unshare-cgroup-try[Create new cgroup namespace if possible else continue by skipping it]'
-    '(--unshare-user)--userns[Use this user namespace (cannot combine with --unshare-user)]: :'
-    '(--unshare-user)--userns2[After setup switch to this user namspace, only useful with --userns]: :'
-    '--pidns[Use this user namespace (as parent namespace if using --unshare-pid)]: :'
-    '--uid[Custom uid in the sandbox (requires --unshare-user or --userns)]: :'
-    '--gid[Custom gid in the sandbox (requires --unshare-user or --userns)]: :'
-    '--hostname[Custom hostname in the sandbox (requires --unshare-uts)]: :'
-    '--chdir DIR[Change directory to DIR]: : _files -/'
-    '--setenv[Set an environment variable]: :'
-    '--unsetenv[Unset an environment variable]: :'
-    '--lock-file[Take a lock on DEST while sandbox is running]: :'
-    '--sync-fd[Keep this fd open while sandbox is running]: :'
-    '--bind[Bind mount the host path SRC on DEST]: : _files -/ :'
+    '--as-pid-1[Do not install a reaper process with PID=1]'
+    '--bind-data[Copy from FD to file which is bind-mounted on DEST]: : :'
     '--bind-try[Equal to --bind but ignores non-existent SRC]: : _files -/ :'
-    '--dev-bind[Bind mount the host path SRC on DEST, allowing device access]: : _files -/ :'
+    '--bind[Bind mount the host path SRC on DEST]: : _files -/ :'
+    '--block-fd[Block on FD until some data to read is available]: :'
+    '--cap-add[Add cap CAP when running as privileged user]: :->caps'
+    '--cap-drop[Drop cap CAP when running as privileged user]: :->caps'
+    '--chdir DIR[Change directory to DIR]: : _files -/'
     '--dev-bind-try[Equal to --dev-bind but ignores non-existent SRC]: : _files -/ :'
-    '--ro-bind[Bind mount the host path SRC readonly on DEST]: : _files -/ :'
-    '--ro-bind-try[Equal to --ro-bind but ignores non-existent SRC]: : _files -/ :'
-    '--remount-ro[Remount DEST as readonly; does not recursively remount]: :'
-    '--exec-label[Exec label for the sandbox]: :'
-    '--file-label[File label for temporary sandbox content]: :'
-    '--proc[Mount new procfs on DEST]: :'
+    '--dev-bind[Bind mount the host path SRC on DEST, allowing device access]: : _files -/ :'
     '--dev[Mount new dev on DEST]: :'
-    '--tmpfs[Mount new tmpfs on DEST]: :'
-    '--mqueue[Mount new mqueue on DEST]: :'
+    "--die-with-parent[Kills with SIGKILL child process (COMMAND) when bwrap or bwrap's parent dies.]"
     '--dir[Create dir at DEST]: :'
+    '--exec-label[Exec label for the sandbox]: :'
+    '--file-label[File label for temporary sandbox content]: :'
     '--file[Copy from FD to destination DEST]: : :'
-    '--bind-data[Copy from FD to file which is bind-mounted on DEST]: : :'
-    '--ro-bind-data[Copy from FD to file which is readonly bind-mounted on DEST]: : :'
-    '--symlink[Create symlink at DEST with target SRC]: : :'
-    '--seccomp[Load and use seccomp rules from FD]: :'
-    '--block-fd[Block on FD until some data to read is available]: :'
-    '--userns-block-fd[Block on FD until the user namespace is ready]: :'
+    '--gid[Custom gid in the sandbox (requires --unshare-user or --userns)]: :'
+    '--help[Print help and exit]'
+    '--hostname[Custom hostname in the sandbox (requires --unshare-uts)]: :'
     '--info-fd[Write information about the running container to FD]: :'
     '--json-status-fd[Write container status to FD as multiple JSON documents]: :'
+    '--lock-file[Take a lock on DEST while sandbox is running]: :'
+    '--mqueue[Mount new mqueue on DEST]: :'
     '--new-session[Create a new terminal session]'
-    "--die-with-parent[Kills with SIGKILL child process (COMMAND) when bwrap or bwrap's parent dies.]"
-    '--as-pid-1[Do not install a reaper process with PID=1]'
-    '--cap-add[Add cap CAP when running as privileged user]: :->caps'
-    '--cap-drop[Drop cap CAP when running as privileged user]: :->caps'
+    '--pidns[Use this user namespace (as parent namespace if using --unshare-pid)]: :'
+    '--proc[Mount new procfs on DEST]: :'
+    '--remount-ro[Remount DEST as readonly; does not recursively remount]: :'
+    '--ro-bind-data[Copy from FD to file which is readonly bind-mounted on DEST]: : :'
+    '--ro-bind-try[Equal to --ro-bind but ignores non-existent SRC]: : _files -/ :'
+    '--ro-bind[Bind mount the host path SRC readonly on DEST]: : _files -/ :'
+    '--seccomp[Load and use seccomp rules from FD]: :'
+    '--setenv[Set an environment variable]: :'
+    '--symlink[Create symlink at DEST with target SRC]: : :'
+    '--sync-fd[Keep this fd open while sandbox is running]: :'
+    '--tmpfs[Mount new tmpfs on DEST]: :'
+    '--uid[Custom uid in the sandbox (requires --unshare-user or --userns)]: :'
+    '--unsetenv[Unset an environment variable]: :'
+    '--unshare-all[Unshare every namespace we support by default]'
+    '--unshare-cgroup-try[Create new cgroup namespace if possible else continue by skipping it]'
+    '--unshare-cgroup[Create new cgroup namespace]'
+    '--unshare-ipc[Create new ipc namespace]'
+    '--unshare-net[Create new network namespace]'
+    '--unshare-pid[Create new pid namespace]'
+    '(--userns --userns2)--unshare-user[Create new user namespace (may be automatically implied if not setuid)]'
+    '--unshare-user-try[Create new user namespace if possible else continue by skipping it]'
+    '--unshare-uts[Create new uts namespace]'
+    '(--unshare-user)--userns[Use this user namespace (cannot combine with --unshare-user)]: :'
+    '--userns-block-fd[Block on FD until the user namespace is ready]: :'
+    '(--unshare-user)--userns2[After setup switch to this user namspace, only useful with --userns]: :'
+    '--version[Print version]'
 )