Skip to content

Commit 34ba441

Browse files
authored
Merge pull request #75 from louvri/bugfix/gnorm_download_command
Bugfix/gnorm download command
2 parents 5550a24 + 8d78371 commit 34ba441

File tree

3 files changed

+30
-18
lines changed

3 files changed

+30
-18
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
build
22
.vscode
33
.gen_gosl_build
4-
gosl-gen
4+
gosl-gen
5+
tmp

cmd/root.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,19 @@ func init() {
6161
},
6262
}
6363
rootCmd.AddCommand(versionCmd)
64+
65+
var initCmd = &cobra.Command{
66+
Use: "init",
67+
Short: `gosl-gen init`,
68+
Long: `gosl-gen init`,
69+
Run: func(cmd *cobra.Command, args []string) {
70+
runner := process.New()
71+
if err := runner.Initialize(cfg); err != nil {
72+
fmt.Printf("gosl-gen init failed %v\n", err)
73+
} else {
74+
fmt.Println("gosl is initiated")
75+
}
76+
},
77+
}
78+
rootCmd.AddCommand(initCmd)
6479
}

internal/process/process.go

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,44 +37,39 @@ type runner struct {
3737
config map[string]any
3838
}
3939

40-
func (r *runner) Initialize(path string) error {
41-
fmt.Println("read config")
42-
err := r.getConfig(path)
43-
if err != nil {
44-
return err
40+
func (r *runner) Initialize(path string) (err error) {
41+
if path != "" {
42+
fmt.Println("read config")
43+
err = r.getConfig(path)
44+
if err != nil {
45+
return err
46+
}
4547
}
4648
err = run("mkdir", "-p", "tmp")
4749
if err != nil {
4850
return err
4951
}
50-
err = run("cd", "tmp")
52+
err = run("curl", "-L", "-o", "./tmp/gnorm.tar.gz", "https://github.com/gnormal/gnorm/releases/download/v1.1.1/gnorm_1.1.1_macOS-64bit.tar.gz")
5153
if err != nil {
5254
return err
5355
}
54-
err = run("curl", "-L", "-o", "gnorm.tar.gz", "https://github.com/gnormal/gnorm/releases/latest/download/v1.1.1/gnorm_1.1.1_macOS-64bit.tar.gz")
56+
err = run("tar", "-xzf", "./tmp/gnorm.tar.gz", "-C", "./tmp")
5557
if err != nil {
5658
return err
5759
}
58-
err = run("tar", "-xzf", "gnorm.tar.gz")
60+
err = run("chmod", "+x", "./tmp/gnorm")
5961
if err != nil {
6062
return err
6163
}
62-
err = run("chmod", "+x", "./gnorm")
63-
if err != nil {
64-
return err
65-
}
66-
err = run("mv", "./gnorm", "~/go/bin/gnorm")
64+
homeDir, _ := os.UserHomeDir()
65+
err = run("mv", "./tmp/gnorm", fmt.Sprintf("%s/go/bin", homeDir))
6766
if err != nil {
6867
return err
6968
}
7069
err = run("rm", "-rf", "./tmp")
7170
if err != nil {
7271
return err
7372
}
74-
err = run("cd", "..")
75-
if err != nil {
76-
return err
77-
}
7873
fmt.Println("gnorm.org is installed")
7974
err = run("go", "get", "github.com/louvri/gosl")
8075
if err != nil {
@@ -339,6 +334,7 @@ func (r *runner) getConfig(path string) error {
339334
func run(cli string, args ...string) error {
340335

341336
cmd := exec.Command(cli, args...)
337+
fmt.Println("executing", cmd.String())
342338
cmd.Stdin = os.Stdin
343339
cmd.Stderr = os.Stderr
344340
stdOut, err := cmd.StdoutPipe()

0 commit comments

Comments
 (0)