func main() {
if len(os.Args) < 2 || strings.HasPrefix(os.Args[1], "-") {
- parseFlags([]string{"-help"})
+ parseFlags(os.Args[0], []string{"-help"}, os.Stderr)
os.Exit(2)
}
os.Exit(handler.RunCommand(os.Args[0], os.Args[1:], os.Stdin, os.Stdout, os.Stderr))
func (cf cmdFunc) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
logger := ctxlog.New(stderr, "text", "info")
ctx := ctxlog.Context(context.Background(), logger)
- opts, err := parseFlags(args)
- if err != nil {
- logger.WithError(err).Error("error parsing command line flags")
- return 1
+ opts, ok, code := parseFlags(prog, args, stderr)
+ if !ok {
+ return code
}
- err = cf(ctx, opts, stdin, stdout, stderr)
+ err := cf(ctx, opts, stdin, stdout, stderr)
if err != nil {
logger.WithError(err).Error("failed")
return 1
RebuildImage bool
SourceDir string
TargetOS string
+ Maintainer string
+ Vendor string
}
-func parseFlags(args []string) (opts, error) {
+func parseFlags(prog string, args []string, stderr io.Writer) (_ opts, ok bool, exitCode int) {
opts := opts{
- SourceDir: ".",
- TargetOS: "debian:10",
+ SourceDir: ".",
+ TargetOS: "debian:10",
+ Maintainer: "Arvados Package Maintainers <packaging@arvados.org>",
+ Vendor: "The Arvados Project",
}
flags := flag.NewFlagSet("", flag.ContinueOnError)
flags.StringVar(&opts.PackageVersion, "package-version", opts.PackageVersion, "package version to build/test, like \"1.2.3\"")
flags.StringVar(&opts.PackageDir, "package-dir", opts.PackageDir, "destination directory for new package (default is cwd)")
flags.StringVar(&opts.PackageChown, "package-chown", opts.PackageChown, "desired uid:gid for new package (default is current user:group)")
flags.StringVar(&opts.TargetOS, "target-os", opts.TargetOS, "target operating system vendor:version")
+ flags.StringVar(&opts.Maintainer, "package-maintainer", opts.Maintainer, "maintainer to be listed in package metadata")
+ flags.StringVar(&opts.Vendor, "package-vendor", opts.Vendor, "vendor to be listed in package metadata")
flags.BoolVar(&opts.RebuildImage, "rebuild-image", opts.RebuildImage, "rebuild docker image(s) instead of using existing")
flags.Usage = func() {
fmt.Fprint(flags.Output(), `Usage: arvados-package <subcommand> [options]
image, and be prepared to rebuild that VM image when package-building
slows down (this will happen when new dependencies are introduced).
+ The "build" subcommand, if successful, also runs
+ dpkg-scanpackages to create/replace Packages.gz in the package
+ dir. This enables the "testinstall" subcommand to list the
+ package dir as a source in /etc/apt/sources.*.
+
Options:
`)
flags.PrintDefaults()
}
- err := flags.Parse(args)
- if err != nil {
- return opts, err
- }
- if len(flags.Args()) > 0 {
- return opts, fmt.Errorf("unrecognized command line arguments: %v", flags.Args())
+ if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok {
+ return opts, false, code
}
if opts.SourceDir == "" {
d, err := os.Getwd()
if err != nil {
- return opts, fmt.Errorf("Getwd: %w", err)
+ fmt.Fprintf(stderr, "error getting current working directory: %s\n", err)
+ return opts, false, 1
}
opts.SourceDir = d
}
opts.PackageDir = filepath.Clean(opts.PackageDir)
- opts.SourceDir, err = filepath.Abs(opts.SourceDir)
+ abs, err := filepath.Abs(opts.SourceDir)
if err != nil {
- return opts, err
+ fmt.Fprintf(stderr, "error resolving source dir %q: %s\n", opts.SourceDir, err)
+ return opts, false, 1
}
- return opts, nil
+ opts.SourceDir = abs
+ return opts, true, 0
}