Merge branch 'ZipWithoutBaseDir_SSS' into 'master'

ZipWithoutBaseDirectory

See merge request !28

filehelper/fileHelper.go

@@ -146,6 +146,76 @@ func Zip(source, target string) error {
 	return err
 }
 
+//ZipWithoutBaseDirectory Zip Without Base Directory
+func ZipWithoutBaseDirectory(source, target string) error {
+	source = filepath.Clean(source)
+	target = filepath.Clean(target)
+
+	zipfile, err := os.Create(target)
+	if err != nil {
+		return err
+	}
+	defer zipfile.Close()
+
+	archive := zip.NewWriter(zipfile)
+	defer archive.Close()
+
+	info, err := os.Stat(source)
+	if err != nil {
+		return err
+	}
+
+	var baseDir string
+	if info.IsDir() {
+		baseDir = filepath.Base(source)
+	}
+
+	filepath.Walk(source, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		header, err := zip.FileInfoHeader(info)
+		if err != nil {
+			return err
+		}
+
+		if baseDir != "" {
+			header.Name = strings.TrimPrefix(path, source)
+			// Replace all occurances of \\ with /. This is necessary to properly unzip the zip file created on windows system on ubuntu system
+			header.Name = strings.Replace(header.Name, "\\", "/", -1)
+		}
+
+		if info.IsDir() {
+			header.Name += "/"
+		} else {
+			header.Method = zip.Deflate
+		}
+
+		writer, err := archive.CreateHeader(header)
+		if err != nil {
+			return err
+		}
+
+		if info.IsDir() {
+			return nil
+		}
+
+		file, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+		_, err = io.Copy(writer, file)
+		if err != nil {
+		}
+
+		file.Close()
+		return err
+	})
+
+	return err
+}
+
 //ZipWithSkipFileList This method will skip the file added in skiplist from zip
 func ZipWithSkipFileList(source, target string, skipFileList []string) error {