fix: zipping of extension to correct names

FriendsOfShopware · Jan 15, 2022 · c57ea12 · c57ea12
1 parent efd1936
commit c57ea12
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/cmd/extension_zip.go b/cmd/extension_zip.go
@@ -54,6 +54,14 @@ var extensionZipCmd = &cobra.Command{
 
  // Create temp dir
  tempDir, err := ioutil.TempDir("", "extension")
+ extName, err := ext.GetName()
+ if err != nil {
+ log.Fatalln(err)
+ }
+
+ extDir := fmt.Sprintf("%s/%s/", tempDir, extName)
+
+ err = os.Mkdir(extDir, os.ModePerm)
  tempDir = tempDir + "/"
 
  if err != nil {
@@ -68,9 +76,9 @@ var extensionZipCmd = &cobra.Command{
 
  // Extract files using strategy
  if disableGit {
- err = cp.Copy(path, tempDir)
+ err = cp.Copy(path, extDir)
  } else {
- tag, err = extension.GitCopyFolder(path, tempDir)
+ tag, err = extension.GitCopyFolder(path, extDir)
  }
 
  // User input wins
@@ -82,14 +90,14 @@ var extensionZipCmd = &cobra.Command{
  log.Fatalln(err)
  }
 
- err = extension.PrepareFolderForZipping(tempDir, ext)
+ err = extension.PrepareFolderForZipping(extDir, ext)
 
  if err != nil {
  log.Fatalln(err)
  }
 
  // Cleanup not wanted files
- err = extension.CleanupExtensionFolder(tempDir)
+ err = extension.CleanupExtensionFolder(extDir)
  if err != nil {
  log.Fatalln(err)
  }

diff --git a/extension/root.go b/extension/root.go
@@ -7,6 +7,7 @@ import (
  "github.com/hashicorp/go-version"
  "io/ioutil"
  "os"
+ "strings"
 )
 
 func GetExtensionByFolder(path string) (Extension, error) {
@@ -49,7 +50,8 @@ func GetExtensionByZip(filePath string) (Extension, error) {
  return nil, err
  }
 
- return GetExtensionByFolder(dir)
+ extName := strings.Split(file.File[0].Name, "/")[0]
+ return GetExtensionByFolder(fmt.Sprintf("%s/%s", dir, extName))
 }
 
 type extensionTranslated struct {