Fix install without args

This commit is contained in:
Frederic Branczyk 2018-04-28 18:01:00 +01:00
parent 07445571e6
commit 7959a767ed
No known key found for this signature in database
GPG key ID: 7741A52782A90069

View file

@ -106,6 +106,7 @@ func installCommand(jsonnetHome string, urls ...*url.URL) int {
kingpin.Fatalf("failed to load jsonnetfile: %v", err) kingpin.Fatalf("failed to load jsonnetfile: %v", err)
return 1 return 1
} }
if len(urls) > 0 { if len(urls) > 0 {
for _, url := range urls { for _, url := range urls {
// install package specified in command // install package specified in command
@ -181,43 +182,43 @@ func installCommand(jsonnetHome string, urls ...*url.URL) int {
m.Dependencies = newDeps m.Dependencies = newDeps
} }
} }
}
srcPath := filepath.Join(jsonnetHome) srcPath := filepath.Join(jsonnetHome)
err = os.MkdirAll(srcPath, os.ModePerm) err = os.MkdirAll(srcPath, os.ModePerm)
if err != nil { if err != nil {
kingpin.Fatalf("failed to create jsonnet home path: %v", err) kingpin.Fatalf("failed to create jsonnet home path: %v", err)
return 3 return 3
} }
lock, err := pkg.Install(context.TODO(), m, jsonnetHome) lock, err := pkg.Install(context.TODO(), m, jsonnetHome)
if err != nil { if err != nil {
kingpin.Fatalf("failed to install: %v", err) kingpin.Fatalf("failed to install: %v", err)
return 3 return 3
} }
b, err := json.MarshalIndent(m, "", " ") b, err := json.MarshalIndent(m, "", " ")
if err != nil { if err != nil {
kingpin.Fatalf("failed to encode jsonnet file: %v", err) kingpin.Fatalf("failed to encode jsonnet file: %v", err)
return 3 return 3
} }
err = ioutil.WriteFile(pkg.JsonnetFile, b, 0644) err = ioutil.WriteFile(pkg.JsonnetFile, b, 0644)
if err != nil { if err != nil {
kingpin.Fatalf("failed to write jsonnet file: %v", err) kingpin.Fatalf("failed to write jsonnet file: %v", err)
return 3 return 3
} }
b, err = json.MarshalIndent(lock, "", " ") b, err = json.MarshalIndent(lock, "", " ")
if err != nil { if err != nil {
kingpin.Fatalf("failed to encode jsonnet file: %v", err) kingpin.Fatalf("failed to encode jsonnet file: %v", err)
return 3 return 3
} }
err = ioutil.WriteFile(pkg.JsonnetLockFile, b, 0644) err = ioutil.WriteFile(pkg.JsonnetLockFile, b, 0644)
if err != nil { if err != nil {
kingpin.Fatalf("failed to write lock file: %v", err) kingpin.Fatalf("failed to write lock file: %v", err)
return 3 return 3
}
} }
return 0 return 0