Merge branch 'fix-hook-flags' into 'main'

Use singular instead of plural for hook arguments

See merge request nvidia/container-toolkit/container-toolkit!146

cmd/nvidia-ctk/hook/create-symlinks/create-symlinks.go

@@ -66,9 +66,8 @@ func (m command) build() *cli.Command {
 			Destination: &cfg.hostRoot,
 		},
 		&cli.StringSliceFlag{
-			Name:        "csv-filenames",
-			Aliases:     []string{"f"},
-			Usage:       "Specify the (CSV) filenames to process",
+			Name:        "csv-filename",
+			Usage:       "Specify a (CSV) filename to process",
 			Destination: &cfg.filenames,
 		},
 		&cli.StringFlag{

cmd/nvidia-ctk/hook/update-ldcache/update-ldcache.go

@@ -59,8 +59,8 @@ func (m command) build() *cli.Command {
 
 	c.Flags = []cli.Flag{
 		&cli.StringSliceFlag{
-			Name:        "folders",
-			Usage:       "Specifiy the additional folders to add to /etc/ld.so.conf before updating the ld cache",
+			Name:        "folder",
+			Usage:       "Specifiy a folder to add to /etc/ld.so.conf before updating the ld cache",
 			Destination: &cfg.folders,
 		},
 		&cli.StringFlag{

internal/discover/ldconfig.go

@@ -74,7 +74,7 @@ func (d ldconfig) Hooks() ([]Hook, error) {
 
 	args := []string{hookPath, "hook", "update-ldcache"}
 	for _, f := range libDirs {
-		args = append(args, "--folders", f)
+		args = append(args, "--folder", f)
 	}
 	h := Hook{
 		Lifecycle: cdi.CreateContainerHook,

internal/discover/symlinks.go

@@ -58,7 +58,7 @@ func (d symlinks) Hooks() ([]Hook, error) {
 
 	args := []string{hookPath, "hook", "create-symlinks"}
 	for _, f := range d.csvFiles {
-		args = append(args, "--csv-filenames", f)
+		args = append(args, "--csv-filename", f)
 	}
 
 	h := Hook{