loveuer/nf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: nfctl new(project name include '/')

Browse Source
This commit is contained in:
loveuer 2024-09-22 20:50:19 -07:00
parent af1e58bce9
commit df318682fa
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/nfctl.yml vendored
View File

@ -5,7 +5,7 @@ on:
- 'release/nfctl/*' - 'release/nfctl/*'
env: env:
RELEASE_VERSION: v24.07.14-r3 RELEASE_VERSION: v24.09.23-r1
jobs: jobs:
build-job: build-job:

14
nft/nfctl/cmd/new.go
View File

@ -3,15 +3,16 @@ package cmd
import ( import (
"errors" "errors"
"fmt" "fmt"
"net/url"
"os"
"path"
"github.com/loveuer/nf/nft/log" "github.com/loveuer/nf/nft/log"
"github.com/loveuer/nf/nft/nfctl/clone" "github.com/loveuer/nf/nft/nfctl/clone"
"github.com/loveuer/nf/nft/nfctl/opt" "github.com/loveuer/nf/nft/nfctl/opt"
"github.com/loveuer/nf/nft/nfctl/tp" "github.com/loveuer/nf/nft/nfctl/tp"
"github.com/loveuer/nf/nft/nfctl/version" "github.com/loveuer/nf/nft/nfctl/version"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"net/url"
"os"
"path"
) )
var ( var (
@ -44,6 +45,7 @@ func initNew() {
err error err error
urlIns *url.URL urlIns *url.URL
pwd string pwd string
moduleName string
projectDir string projectDir string
initBs []byte initBs []byte
renderBs []byte renderBs []byte
@ -58,7 +60,8 @@ func initNew() {
return fmt.Errorf("get work dir err") return fmt.Errorf("get work dir err")
} }
projectDir = path.Join(pwd, args[0]) moduleName = args[0]
projectDir = path.Join(pwd, path.Base(args[0]))
if _, err = os.Stat(projectDir); !errors.Is(err, os.ErrNotExist) { if _, err = os.Stat(projectDir); !errors.Is(err, os.ErrNotExist) {
return fmt.Errorf("project folder already exist") return fmt.Errorf("project folder already exist")
@ -101,7 +104,8 @@ func initNew() {
} }
if renderBs, err = tp.RenderVar(initBs, map[string]any{ if renderBs, err = tp.RenderVar(initBs, map[string]any{
"PROJECT_NAME": args[0], "PROJECT_NAME": projectDir,
"MODULE_NAME": moduleName,
}); err != nil { }); err != nil {
return fmt.Errorf("render template init script err: %v", err) return fmt.Errorf("render template init script err: %v", err)
} }