Merge pull request #1585 from rsteube/systemctl-user-manager

systemctl user manager
carapace-sh · Mar 22, 2023 · 6a6a3db · 6a6a3db
2 parents 63909f6 + b2009af
commit 6a6a3db
Show file tree

Hide file tree

Showing 57 changed files with 285 additions and 159 deletions.
diff --git a/completers/systemctl_completer/cmd/action/action.go b/completers/systemctl_completer/cmd/action/action.go
@@ -0,0 +1,38 @@
+package action
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/systemctl"
+	"github.com/spf13/cobra"
+)
+
+func userFlag(cmd *cobra.Command) bool {
+	if flag := cmd.Root().Flag("user"); flag != nil && flag.Changed {
+		return true
+	}
+	return false
+}
+
+func ActionProperties(cmd *cobra.Command, units ...string) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		return systemctl.ActionProperties(systemctl.PropertiesOpts{User: userFlag(cmd), Units: units})
+	})
+}
+
+func ActionServices(cmd *cobra.Command) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		return systemctl.ActionServices(userFlag(cmd))
+	})
+}
+
+func ActionTargets(cmd *cobra.Command) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		return systemctl.ActionTargets(userFlag(cmd))
+	})
+}
+
+func ActionUnits(cmd *cobra.Command) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		return systemctl.ActionUnits(userFlag(cmd))
+	})
+}
diff --git a/completers/systemctl_completer/cmd/action/environment.go b/completers/systemctl_completer/cmd/action/environment.go
diff --git a/completers/systemctl_completer/cmd/action/log.go b/completers/systemctl_completer/cmd/action/log.go
diff --git a/completers/systemctl_completer/cmd/action/service.go b/completers/systemctl_completer/cmd/action/service.go
diff --git a/completers/systemctl_completer/cmd/action/target.go b/completers/systemctl_completer/cmd/action/target.go
diff --git a/completers/systemctl_completer/cmd/action/unit.go b/completers/systemctl_completer/cmd/action/unit.go
diff --git a/completers/systemctl_completer/cmd/addRequires.go b/completers/systemctl_completer/cmd/addRequires.go
@@ -18,12 +18,12 @@ func init() {
 	rootCmd.AddCommand(addRequiresCmd)
 
 	carapace.Gen(addRequiresCmd).PositionalCompletion(
-		action.ActionTargets(),
+		action.ActionTargets(addRequiresCmd),
 	)
 
 	carapace.Gen(addRequiresCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(addRequiresCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/addWants.go b/completers/systemctl_completer/cmd/addWants.go
@@ -18,12 +18,12 @@ func init() {
 	rootCmd.AddCommand(addWantsCmd)
 
 	carapace.Gen(addWantsCmd).PositionalCompletion(
-		action.ActionTargets(),
+		action.ActionTargets(addWantsCmd),
 	)
 
 	carapace.Gen(addWantsCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(addWantsCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/bind.go b/completers/systemctl_completer/cmd/bind.go
@@ -18,7 +18,7 @@ func init() {
 	rootCmd.AddCommand(bindCmd)
 
 	carapace.Gen(bindCmd).PositionalCompletion(
-		action.ActionUnits(),
+		action.ActionUnits(bindCmd),
 		carapace.ActionFiles(),
 		carapace.ActionFiles(),
 	)

diff --git a/completers/systemctl_completer/cmd/cat.go b/completers/systemctl_completer/cmd/cat.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(catCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(catCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/clean.go b/completers/systemctl_completer/cmd/clean.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(cleanCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(cleanCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/disable.go b/completers/systemctl_completer/cmd/disable.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(disableCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(disableCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/edit.go b/completers/systemctl_completer/cmd/edit.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(editCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(editCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/enable.go b/completers/systemctl_completer/cmd/enable.go
@@ -20,7 +20,7 @@ func init() {
 	carapace.Gen(enableCmd).PositionalAnyCompletion(
 		carapace.Batch(
 			carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-				return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+				return action.ActionUnits(enableCmd).Invoke(c).Filter(c.Args).ToA()
 			}),
 			carapace.ActionFiles(),
 		).ToA(),

diff --git a/completers/systemctl_completer/cmd/freeze.go b/completers/systemctl_completer/cmd/freeze.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(freezeCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(freezeCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/help.go b/completers/systemctl_completer/cmd/help.go
@@ -21,7 +21,7 @@ func init() {
 	carapace.Gen(helpCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			return carapace.Batch(
-				action.ActionUnits(),
+				action.ActionUnits(helpCmd),
 				ps.ActionProcessIds(),
 			).ToA().Invoke(c).Filter(c.Args).ToA()
 		}),

diff --git a/completers/systemctl_completer/cmd/isActive.go b/completers/systemctl_completer/cmd/isActive.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(isActiveCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(isActiveCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/isEnabled.go b/completers/systemctl_completer/cmd/isEnabled.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(isEnabledCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(isEnabledCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/isFailed.go b/completers/systemctl_completer/cmd/isFailed.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(isFailedCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(isFailedCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/isolate.go b/completers/systemctl_completer/cmd/isolate.go
@@ -18,6 +18,6 @@ func init() {
 	rootCmd.AddCommand(isolateCmd)
 
 	carapace.Gen(isolateCmd).PositionalCompletion(
-		action.ActionUnits(),
+		action.ActionUnits(isolateCmd),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/kill.go b/completers/systemctl_completer/cmd/kill.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(killCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(killCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/link.go b/completers/systemctl_completer/cmd/link.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(linkCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(linkCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/listDependencies.go b/completers/systemctl_completer/cmd/listDependencies.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(listDependenciesCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(listDependenciesCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/listSockets.go b/completers/systemctl_completer/cmd/listSockets.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(listSocketsCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(listSocketsCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/listTimers.go b/completers/systemctl_completer/cmd/listTimers.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(listTimersCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(listTimersCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/listUnits.go b/completers/systemctl_completer/cmd/listUnits.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(listUnitsCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(listUnitsCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/logLevel.go b/completers/systemctl_completer/cmd/logLevel.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/completers/systemctl_completer/cmd/action"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/systemctl"
 	"github.com/spf13/cobra"
 )
 
@@ -18,6 +18,6 @@ func init() {
 	rootCmd.AddCommand(logLevelCmd)
 
 	carapace.Gen(logLevelCmd).PositionalCompletion(
-		action.ActionLogLevels(),
+		systemctl.ActionLogLevels(),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/logTarget.go b/completers/systemctl_completer/cmd/logTarget.go
@@ -18,6 +18,6 @@ func init() {
 	rootCmd.AddCommand(logTargetCmd)
 
 	carapace.Gen(logTargetCmd).PositionalCompletion(
-		action.ActionTargets(),
+		action.ActionTargets(logTargetCmd),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/mask.go b/completers/systemctl_completer/cmd/mask.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(maskCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(maskCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/preset.go b/completers/systemctl_completer/cmd/preset.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(presetCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(presetCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/reenable.go b/completers/systemctl_completer/cmd/reenable.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(reenableCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(reenableCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/systemctl_completer/cmd/reload.go b/completers/systemctl_completer/cmd/reload.go
@@ -19,7 +19,7 @@ func init() {
 
 	carapace.Gen(reloadCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionUnits().Invoke(c).Filter(c.Args).ToA()
+			return action.ActionUnits(reloadCmd).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }