jolheiser
/
tmpl
1
0
Fork 0
Code Issues Pull Requests Releases 15 Activity

Derive branch name (#27)
ci/woodpecker/push/woodpecker Pipeline was successful Details 

Reviewed-on: #27
Co-authored-by: jolheiser <john.olheiser@gmail.com>
Co-committed-by: jolheiser <john.olheiser@gmail.com>
pull/28/head^2
jolheiser 2023-08-17 04:02:19 +00:00 committed by jolheiser
parent 4981a14e14
commit 512bf7394d
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FAQ.md
View File

@ -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.toml` (default: `~/.tmpl/registry.toml`).
1. The simplest solution is to make a copy of your `registry.yaml` (default: `~/.tmpl/registry.yaml`).
* 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.

24
cmd/download.go
View File

@ -2,6 +2,8 @@ package cmd
import (
"fmt"
"os"
"path"
"strings"
"go.jolheiser.com/tmpl/env"
@ -15,7 +17,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",
@ -29,7 +31,7 @@ var Download = &cli.Command{
}
func runDownload(ctx *cli.Context) error {
if ctx.NArg() < 2 {
if ctx.NArg() < 1 {
return cli.ShowCommandHelp(ctx, ctx.Command.Name)
}
@ -67,7 +69,7 @@ func runDownload(ctx *cli.Context) error {
cloneURL += ".git"
}
t, err := reg.DownloadTemplate(ctx.Args().Get(1), cloneURL, ctx.String("branch"))
t, err := reg.DownloadTemplate(deriveName(ctx), cloneURL, ctx.String("branch"))
if err != nil {
return err
}
@ -75,3 +77,19 @@ 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())
}