FAQ.md

@@ -113,7 +113,7 @@ I realize that many users will be using GitHub, and most will likely still be us
 
 ## Backup and Restore
 
-1. The simplest solution is to make a copy of your `registry.yaml` (default: `~/.tmpl/registry.yaml`).
+1. The simplest solution is to make a copy of your `registry.toml` (default: `~/.tmpl/registry.toml`).
    * Once in the new location, you will need to use `tmpl restore`.
    
 2. Alternatively, you can copy/paste the entire registry (default: `~/.tmpl`) and skip the restore step.

cmd/download.go

@@ -2,8 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"os"
-	"path"
 	"strings"
 
 	"go.jolheiser.com/tmpl/env"
@@ -17,7 +15,7 @@ var Download = &cli.Command{
 	Name:        "download",
 	Usage:       "Download a template",
 	Description: "Download a template and save it to the local registry",
-	ArgsUsage:   "[repository URL] <name>",
+	ArgsUsage:   "[repository URL] [name]",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:    "branch",
@@ -31,7 +29,7 @@ var Download = &cli.Command{
 }
 
 func runDownload(ctx *cli.Context) error {
-	if ctx.NArg() < 1 {
+	if ctx.NArg() < 2 {
 		return cli.ShowCommandHelp(ctx, ctx.Command.Name)
 	}
 
@@ -69,7 +67,7 @@ func runDownload(ctx *cli.Context) error {
 		cloneURL += ".git"
 	}
 
-	t, err := reg.DownloadTemplate(deriveName(ctx), cloneURL, ctx.String("branch"))
+	t, err := reg.DownloadTemplate(ctx.Args().Get(1), cloneURL, ctx.String("branch"))
 	if err != nil {
 		return err
 	}
@@ -77,19 +75,3 @@ func runDownload(ctx *cli.Context) error {
 	log.Info().Msgf("Added new template %q", t.Name)
 	return nil
 }
-
-func deriveName(ctx *cli.Context) string {
-	if ctx.NArg() > 1 {
-		return ctx.Args().Get(1)
-	}
-
-	envBranch, envSet := os.LookupEnv("TMPL_BRANCH")
-	flagBranch, flagSet := ctx.String("branch"), ctx.IsSet("branch")
-	if flagSet {
-		if !envSet || envBranch != flagBranch {
-			return flagBranch
-		}
-	}
-
-	return path.Base(ctx.Args().First())
-}