diff options
| -rw-r--r-- | comp/_fortify | 28 | ||||
| -rw-r--r-- | main.go | 26 | ||||
| -rw-r--r-- | main_test.go | 24 |
3 files changed, 39 insertions, 39 deletions
diff --git a/comp/_fortify b/comp/_fortify index d45f9da6..2eeaf845 100644 --- a/comp/_fortify +++ b/comp/_fortify @@ -7,24 +7,24 @@ _fortify_app() { _fortify_run() { _arguments \ - '--id[App ID, leave empty to disable security context app_id]:id' \ - '-a[Fortify application ID]: :_numbers' \ - '-g[Groups inherited by the app process]: :_groups' \ - '-d[Application home directory]: :_files -/' \ - '-u[Passwd name within sandbox]: :_users' \ - '--wayland[Share Wayland socket]' \ - '-X[Share X11 socket and allow connection]' \ - '--dbus[Proxy D-Bus connection]' \ - '--pulse[Share PulseAudio socket and cookie]' \ - '--dbus-config[Path to D-Bus proxy config file]: :_files -g "*.json"' \ - '--dbus-system[Path to system D-Bus proxy config file]: :_files -g "*.json"' \ + '--id[Reverse-DNS style Application identifier, leave empty to inherit instance identifier]:id' \ + '-a[Application identity]: :_numbers' \ + '-g[Groups inherited by all container processes]: :_groups' \ + '-d[Container home directory]: :_files -/' \ + '-u[Passwd user name within sandbox]: :_users' \ + '--wayland[Enable connection to Wayland via security-context-v1]' \ + '-X[Enable direct connection to X11]' \ + '--dbus[Enable proxied connection to D-Bus]' \ + '--pulse[Enable direct connection to PulseAudio]' \ + '--dbus-config[Path to session bus proxy config file]: :_files -g "*.json"' \ + '--dbus-system[Path to system bus proxy config file]: :_files -g "*.json"' \ '--mpris[Allow owning MPRIS D-Bus path]' \ - '--dbus-log[Force logging in the D-Bus proxy]' + '--dbus-log[Force buffered logging in the D-Bus proxy]' } _fortify_ps() { _arguments \ - '--short[Print instance id]' + '--short[List instances only]' } _fortify_show() { @@ -78,5 +78,5 @@ __fortify_instances() { _arguments -C \ '-v[Verbose output]' \ - '--json[Format output in JSON when applicable]' \ + '--json[Serialise output in JSON when applicable]' \ '*::fortify command:_fortify_commands'
\ No newline at end of file @@ -72,7 +72,7 @@ func buildCommand(out io.Writer) command.Command { return nil }). Flag(&flagVerbose, "v", command.BoolFlag(false), "Print debug messages to the console"). - Flag(&flagJSON, "json", command.BoolFlag(false), "Serialise output as JSON when applicable") + Flag(&flagJSON, "json", command.BoolFlag(false), "Serialise output in JSON when applicable") c.Command("shim", command.UsageInternal, func([]string) error { instance.ShimMain(); return errSuccess }) @@ -205,31 +205,31 @@ func buildCommand(out io.Writer) command.Command { panic("unreachable") }). Flag(&dbusConfigSession, "dbus-config", command.StringFlag("builtin"), - "Path to D-Bus proxy config file, or \"builtin\" for defaults"). + "Path to session bus proxy config file, or \"builtin\" for defaults"). Flag(&dbusConfigSystem, "dbus-system", command.StringFlag("nil"), - "Path to system D-Bus proxy config file, or \"nil\" to disable"). + "Path to system bus proxy config file, or \"nil\" to disable"). Flag(&mpris, "mpris", command.BoolFlag(false), "Allow owning MPRIS D-Bus path, has no effect if custom config is available"). Flag(&dbusVerbose, "dbus-log", command.BoolFlag(false), - "Force logging in the D-Bus proxy"). + "Force buffered logging in the D-Bus proxy"). Flag(&fid, "id", command.StringFlag(""), - "App ID, leave empty to disable security context app_id"). + "Reverse-DNS style Application identifier, leave empty to inherit instance identifier"). Flag(&aid, "a", command.IntFlag(0), - "Fortify application ID"). + "Application identity"). Flag(nil, "g", &groups, - "Groups inherited by the app process"). + "Groups inherited by all container processes"). Flag(&homeDir, "d", command.StringFlag("os"), - "Application home directory"). + "Container home directory"). Flag(&userName, "u", command.StringFlag("chronos"), - "Passwd name within sandbox"). + "Passwd user name within sandbox"). Flag(&wayland, "wayland", command.BoolFlag(false), - "Allow Wayland connections"). + "Enable connection to Wayland via security-context-v1"). Flag(&x11, "X", command.BoolFlag(false), - "Share X11 socket and allow connection"). + "Enable direct connection to X11"). Flag(&dBus, "dbus", command.BoolFlag(false), - "Proxy D-Bus connection"). + "Enable proxied connection to D-Bus"). Flag(&pulse, "pulse", command.BoolFlag(false), - "Share PulseAudio socket and cookie") + "Enable direct connection to PulseAudio") } var showFlagShort bool diff --git a/main_test.go b/main_test.go index d965f3e5..39c88ccd 100644 --- a/main_test.go +++ b/main_test.go @@ -36,31 +36,31 @@ Commands: Usage: fortify run [-h | --help] [--dbus-config <value>] [--dbus-system <value>] [--mpris] [--dbus-log] [--id <value>] [-a <int>] [-g <value>] [-d <value>] [-u <value>] [--wayland] [-X] [--dbus] [--pulse] COMMAND [OPTIONS] Flags: - -X Share X11 socket and allow connection + -X Enable direct connection to X11 -a int - Fortify application ID + Application identity -d string - Application home directory (default "os") + Container home directory (default "os") -dbus - Proxy D-Bus connection + Enable proxied connection to D-Bus -dbus-config string - Path to D-Bus proxy config file, or "builtin" for defaults (default "builtin") + Path to session bus proxy config file, or "builtin" for defaults (default "builtin") -dbus-log - Force logging in the D-Bus proxy + Force buffered logging in the D-Bus proxy -dbus-system string - Path to system D-Bus proxy config file, or "nil" to disable (default "nil") + Path to system bus proxy config file, or "nil" to disable (default "nil") -g value - Groups inherited by the app process + Groups inherited by all container processes -id string - App ID, leave empty to disable security context app_id + Reverse-DNS style Application identifier, leave empty to inherit instance identifier -mpris Allow owning MPRIS D-Bus path, has no effect if custom config is available -pulse - Share PulseAudio socket and cookie + Enable direct connection to PulseAudio -u string - Passwd name within sandbox (default "chronos") + Passwd user name within sandbox (default "chronos") -wayland - Allow Wayland connections + Enable connection to Wayland via security-context-v1 `, }, |