cmd/enter: Don't use double negation

Double negation is hard to wrap your head around.

https://github.com/containers/toolbox/pull/913
This commit is contained in:
Ondřej Míchal 2021-10-25 03:46:02 +03:00
parent 4d9849c386
commit 02a831466e
2 changed files with 8 additions and 8 deletions

View File

@ -80,7 +80,7 @@ func enter(cmd *cobra.Command, args []string) error {
var container string var container string
var containerArg string var containerArg string
var nonDefaultContainer bool var defaultContainer bool = true
if len(args) != 0 { if len(args) != 0 {
container = args[0] container = args[0]
@ -91,7 +91,7 @@ func enter(cmd *cobra.Command, args []string) error {
} }
if container != "" { if container != "" {
nonDefaultContainer = true defaultContainer = false
if !utils.IsContainerNameValid(container) { if !utils.IsContainerNameValid(container) {
var builder strings.Builder var builder strings.Builder
@ -106,7 +106,7 @@ func enter(cmd *cobra.Command, args []string) error {
var release string var release string
if enterFlags.release != "" { if enterFlags.release != "" {
nonDefaultContainer = true defaultContainer = false
var err error var err error
release, err = utils.ParseRelease(enterFlags.distro, enterFlags.release) release, err = utils.ParseRelease(enterFlags.distro, enterFlags.release)
@ -150,7 +150,7 @@ func enter(cmd *cobra.Command, args []string) error {
} }
if err := runCommand(container, if err := runCommand(container,
!nonDefaultContainer, defaultContainer,
image, image,
release, release,
command, command,

View File

@ -86,10 +86,10 @@ func run(cmd *cobra.Command, args []string) error {
return nil return nil
} }
var nonDefaultContainer bool var defaultContainer bool = true
if runFlags.container != "" { if runFlags.container != "" {
nonDefaultContainer = true defaultContainer = false
if !utils.IsContainerNameValid(runFlags.container) { if !utils.IsContainerNameValid(runFlags.container) {
var builder strings.Builder var builder strings.Builder
@ -104,7 +104,7 @@ func run(cmd *cobra.Command, args []string) error {
var release string var release string
if runFlags.release != "" { if runFlags.release != "" {
nonDefaultContainer = true defaultContainer = false
var err error var err error
release, err = utils.ParseRelease(runFlags.distro, runFlags.release) release, err = utils.ParseRelease(runFlags.distro, runFlags.release)
@ -136,7 +136,7 @@ func run(cmd *cobra.Command, args []string) error {
} }
if err := runCommand(container, if err := runCommand(container,
!nonDefaultContainer, defaultContainer,
image, image,
release, release,
command, command,