From b63f1dd70de4c9a73212fd7d17687ca7fb7fdd07 Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Tue, 20 Jul 2021 18:31:50 +0930 Subject: [PATCH] Make editing manifest optional for LFS builds --- Client/Package/CreatePackage.go | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Client/Package/CreatePackage.go b/Client/Package/CreatePackage.go index 687a8a3..320e91c 100644 --- a/Client/Package/CreatePackage.go +++ b/Client/Package/CreatePackage.go @@ -20,9 +20,18 @@ import ( "PackageManager/Variables" ) +func editManifestFile(filePath string) error { + var ( + cmd *exec.Cmd + ) + cmd = exec.Command(Variables.Editor, filePath) + cmd.Stdin = os.Stdin + cmd.Stdout = os.Stdout + return cmd.Run() +} + func writeManifestFile(path, name, version string) error { var ( - cmd *exec.Cmd manifest string filePath string e error @@ -40,15 +49,7 @@ func writeManifestFile(path, name, version string) error { filePath = filepath.Join(path, "manifest.yml") - e = ioutil.WriteFile(filePath, []byte(manifest), 0644) - if e != nil { - return e - } - - cmd = exec.Command(Variables.Editor, filePath) - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - return cmd.Run() + return ioutil.WriteFile(filePath, []byte(manifest), 0644) } func CreatePackage() error { @@ -135,6 +136,11 @@ func CreatePackage() error { return e } + e = editManifestFile(filepath.Join("/tmp/", "manifest.yml")) + if e != nil { + fmt.Println(Color.Fatal(e.Error)) + } + // TODO: Write this file to a better spot? pkgFiles = append(pkgFiles, "/tmp/manifest.yml")