Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add "-t" as a short alias for "--temp-be-activate" #504

Merged
merged 1 commit into from
Dec 11, 2024
Merged

add "-t" as a short alias for "--temp-be-activate" #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 Oxide Computer Company
# Copyright (c) 2007, 2024, Oracle and/or its affiliates.
#

Expand Down Expand Up @@ -290,7 +291,7 @@ def usage(
]

beopts = (
" [--no-be-activate] [--temp-be-activate]\n"
" [--no-be-activate] [-t | --temp-be-activate]\n"
" [--no-backup-be | --require-backup-be] [--backup-be-name name]\n"
" [--deny-new-be | --require-new-be] [--be-name name]\n"
)
Expand Down Expand Up @@ -7234,7 +7235,7 @@ def print_version(pargs):
"deny_new_be" : ("", "deny-new-be"),
"no_backup_be" : ("", "no-backup-be"),
"be_activate" : ("", "no-be-activate"),
"be_temp_activate" : ("", "temp-be-activate"),
"be_temp_activate" : ("t", "temp-be-activate"),
"require_backup_be" : ("", "require-backup-be"),
"require_new_be" : ("", "require-new-be"),

Expand Down
53 changes: 27 additions & 26 deletions src/man/pkg.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.\" Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
.\" Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
.Dd July 20, 2023
.\" Copyright 2024 Oxide Computer Company
.Dd December 10, 2024
.Dt PKG 1
.Os
.Sh NAME
Expand Down Expand Up @@ -37,7 +38,7 @@
.Op Fl \-no-index
.Op Fl \-no-refresh
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand All @@ -62,7 +63,7 @@
.Op Fl \-no-index
.Op Fl \-no-refresh
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand All @@ -87,7 +88,7 @@
.Op Fl \-ignore-missing
.Op Fl \-no-index
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -116,7 +117,7 @@
.Op Fl \-no-index
.Op Fl \-no-refresh
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -147,7 +148,7 @@
.Op Fl \-no-index
.Op Fl \-no-refresh
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand All @@ -171,7 +172,7 @@
.Op Fl \-ignore-missing
.Op Fl \-no-index
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -248,7 +249,7 @@
.Op Fl \-accept
.Op Fl \-licenses
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand All @@ -266,7 +267,7 @@
.Bk -words
.Op Fl nv
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand All @@ -290,7 +291,7 @@
.Op Fl I Ar implementation
.Op Fl V Ar version
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand All @@ -305,7 +306,7 @@
.Bk -words
.Op Fl nvIV
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -336,7 +337,7 @@
.Op Fl \-accept
.Op Fl \-licenses
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -369,7 +370,7 @@
.Op Fl \-accept
.Op Fl \-licenses
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -693,7 +694,7 @@ regular basis.
.Op Fl \-no-index
.Op Fl \-no-refresh
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -913,7 +914,7 @@ on the next boot.
See the
.Xr beadm 8
man page for more information.
.It Fl \-temp-be-activate
.It Fl t | Fl \-temp-be-activate
If a boot environment is created, set it as the active boot environment for the
next boot only (temporary activation).
See the
Expand Down Expand Up @@ -1013,7 +1014,7 @@ will continue operation and exit with return code 8.
.Op Fl \-no-index
.Op Fl \-no-refresh
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -1095,7 +1096,7 @@ sub-command above.
.Op Fl \-ignore-missing
.Op Fl \-no-index
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -1155,7 +1156,7 @@ command above.
.Op Fl \-no-index
.Op Fl \-no-refresh
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -1275,7 +1276,7 @@ command above.
.Op Fl \-no-index
.Op Fl \-no-refresh
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -1330,7 +1331,7 @@ command above.
.Op Fl \-ignore-missing
.Op Fl \-no-index
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -2135,7 +2136,7 @@ Include informational messages regarding packages.
.Op Fl \-accept
.Op Fl \-licenses
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -2185,7 +2186,7 @@ command above.
.Bk -words
.Op Fl nv
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -2264,7 +2265,7 @@ List the mediations that can be set for currently installed packages.
.Op Fl I Ar implementation
.Op Fl V Ar version
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -2301,7 +2302,7 @@ command above.
.Bk -words
.Op Fl nvIV
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -2387,7 +2388,7 @@ options.
.Op Fl \-accept
.Op Fl \-licenses
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down Expand Up @@ -2480,7 +2481,7 @@ command) that are hidden by an inherited facet with the same name.
.Op Fl \-accept
.Op Fl \-licenses
.br
.Op Fl \-no-be-activate | Fl \-temp-be-activate
.Op Fl \-no-be-activate | Oo Fl t | Fl \-temp-be-activate Oc
.Op Fl \-no-backup-be | Fl \-require-backup-be
.Op Fl \-backup-be-name Ar name
.Op Fl \-deny-new-be | Fl \-require-new-be
Expand Down
Loading