forked from toolshed/abra
		
	fix: match Force/NoInput where needed
This commit is contained in:
		@ -126,7 +126,7 @@ var appRemoveCommand = cli.Command{
 | 
			
		||||
		if len(vols) > 0 {
 | 
			
		||||
			if Volumes {
 | 
			
		||||
				var removeVols []string
 | 
			
		||||
				if !internal.Force {
 | 
			
		||||
				if !internal.Force && !internal.NoInput {
 | 
			
		||||
					volumesPrompt := &survey.MultiSelect{
 | 
			
		||||
						Message: "which volumes do you want to remove?",
 | 
			
		||||
						Help:    "'x' indicates selected, enter / return to confirm, ctrl-c to exit, vim mode is enabled",
 | 
			
		||||
@ -138,6 +138,7 @@ var appRemoveCommand = cli.Command{
 | 
			
		||||
						logrus.Fatal(err)
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				for _, vol := range removeVols {
 | 
			
		||||
					err := cl.VolumeRemove(context.Background(), vol, internal.Force) // last argument is for force removing
 | 
			
		||||
					if err != nil {
 | 
			
		||||
 | 
			
		||||
@ -126,7 +126,7 @@ recipes.
 | 
			
		||||
 | 
			
		||||
		var chosenDowngrade string
 | 
			
		||||
		if !internal.Chaos {
 | 
			
		||||
			if internal.Force {
 | 
			
		||||
			if internal.Force || internal.NoInput {
 | 
			
		||||
				chosenDowngrade = availableDowngrades[0]
 | 
			
		||||
				logrus.Debugf("choosing %s as version to downgrade to (--force)", chosenDowngrade)
 | 
			
		||||
			} else {
 | 
			
		||||
 | 
			
		||||
@ -129,7 +129,7 @@ recipes.
 | 
			
		||||
 | 
			
		||||
		var chosenUpgrade string
 | 
			
		||||
		if len(availableUpgrades) > 0 && !internal.Chaos {
 | 
			
		||||
			if internal.Force {
 | 
			
		||||
			if internal.Force || internal.NoInput {
 | 
			
		||||
				chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
 | 
			
		||||
				logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
 | 
			
		||||
			} else {
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user