Merge pull request #5 from go-sharp/bugfix/multiplatform-not-working

Store path name always with slashes in archive

Author: snmed

main.go

@@ -16,7 +16,7 @@ import (
 	"github.com/jessevdk/go-flags"
 )
 
-const version = "v0.1.2"
+const version = "v0.1.3"
 
 var commonOpts options
 var parser = flags.NewParser(&commonOpts, flags.HelpFlag|flags.PassDoubleDash)
@@ -148,7 +148,7 @@ func extractZipArchive(src, dst string) error {
 	defer zipReader.Close()
 
 	for _, f := range zipReader.File {
-		dFName := filepath.Join(dst, f.Name)
+		dFName := filepath.FromSlash(filepath.Join(dst, f.Name))
 		// We ignore the error here because we get one as soon we open the file
 		_ = os.MkdirAll(filepath.Dir(dFName), 0777)
 		extractToFile(f, dFName)
@@ -225,11 +225,12 @@ func addFileToArchive(file, dir string, zw *zip.Writer) error {
 	}
 
 	name := strings.TrimLeft(strings.TrimPrefix(file, dir), string(filepath.Separator))
+
 	fh, err := zip.FileInfoHeader(fiStat)
 	if err != nil {
 		return err
 	}
-	fh.Name = name
+	fh.Name = filepath.ToSlash(name)
 
 	writer, err := zw.CreateHeader(fh)
 	if err != nil {

publish.go

@@ -100,7 +100,11 @@ func (j *JFrogPublishCmd) Execute(args []string) error {
 	}()
 
 	log.Println("publishing modules")
-	filepath.Walk(workDir, func(path string, info os.FileInfo, err error) error {
+	err := filepath.Walk(workDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
 		if strings.HasPrefix(info.Name(), "cache") {
 			return filepath.SkipDir
 		}
@@ -116,7 +120,7 @@ func (j *JFrogPublishCmd) Execute(args []string) error {
 	<-doneCh
 
 	log.Println("modules successfully uploaded")
-	return nil
+	return err
 }
 
 func (j JFrogPublishCmd) getJFrogCfg() (config []string) {
@@ -171,6 +175,10 @@ func (f FolderPublishCmd) Execute(args []string) error {
 	dirPrefix := filepath.Join(workDir, "cache", "download")
 	var wg sync.WaitGroup
 	err = filepath.Walk(dirPrefix, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
 		relPath := strings.TrimLeft(strings.TrimPrefix(path, dirPrefix), string(filepath.Separator))
 
 		if strings.HasPrefix(relPath, "sumdb") && !info.IsDir() {
@@ -194,10 +202,11 @@ func (f FolderPublishCmd) Execute(args []string) error {
 		return nil
 	})
 
+	wg.Wait()
+
 	if err != nil {
-		log.Println(errorRedPrefix, err)
+		return err
 	}
-	wg.Wait()
 
 	ppath, _ := filepath.Abs(f.Output)
 	log.Println("published archive to:", color.GreenString(ppath))