working commit

pkg/auxutar/utar.go

@@ -15,16 +15,15 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 )
 
-// TODO: file and dir modes
-
 func Archive(srcdir, dstpath string) error {
 	var err error
 	srcdir = filepath.Clean(srcdir)
 	dstpath = filepath.Clean(dstpath)
 
-	err = os.MkdirAll(filepath.Dir(dstpath), 0755)
+	err = os.MkdirAll(filepath.Dir(dstpath), 0750)
 	if err != nil {
 		return err
 	}
@@ -50,17 +49,23 @@ func Archive(srcdir, dstpath string) error {
 		}
 		header.Name = strings.TrimPrefix(filename, filepath.Clean(srcdir))
 		header.Name = strings.TrimPrefix(header.Name, string(filepath.Separator))
-
 		err = tarWriter.WriteHeader(header)
 		if err != nil {
 			return err
 		}
-		file, err := os.Open(filename)
-		if err != nil {
+		wrapfunc := func() error {
+			file, err := os.Open(filename)
+			if err != nil {
+				return err
+			}
+			defer file.Close()
+			_, err = io.Copy(tarWriter, file)
+			if err != nil {
+				return err
+			}
 			return err
 		}
-		defer file.Close()
-		_, err = io.Copy(tarWriter, file)
+		err = wrapfunc()
 		if err != nil {
 			return err
 		}
@@ -98,31 +103,54 @@ func Unarchive(filename, dstdir string) error {
 		}
 		target := filepath.Join(dstdir, header.Name)
 		target = filepath.Clean(target)
-		//fileInfo := header.FileInfo()
+
+		fileInfo := header.FileInfo()
+
 		switch header.Typeflag {
 		case tar.TypeDir:
 			_, err := os.Stat(target)
-			if err != nil {
-				err := os.MkdirAll(target, 0755)
+			if err != nil && err == os.ErrNotExist {
+				err := os.MkdirAll(target, fileInfo.Mode())
 				if err != nil {
 					return err
 				}
-
+			}
+			if err != nil {
+				return err
 			}
 		case tar.TypeReg:
-			err := os.MkdirAll(filepath.Dir(target), 0755)
+			wrapfunc := func() error {
+				dir := filepath.Dir(target)
+				_, err := os.Stat(dir)
+				if err != nil && err == os.ErrNotExist {
+					err := os.MkdirAll(dir, 0750)
+					if err != nil {
+						return err
+					}
+				}
+				file, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, fileInfo.Mode())
+				if err != nil {
+					return err
+				}
+				defer file.Close()
+				_, err = io.Copy(file, tarReader)
+				if err != nil {
+					return err
+				}
+				return err
+			}
+			err = wrapfunc()
 			if err != nil {
 				return err
 			}
-			file, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.FileMode(header.Mode))
-			if err != nil {
-				return err
-			}
-			_, err = io.Copy(file, tarReader)
-			if err != nil {
-				return err
-			}
-			file.Close()
+		}
+		err = os.Chtimes(target, time.Now(), fileInfo.ModTime())
+		if err != nil {
+			return err
+		}
+		err = file.Chmod(fileInfo.Mode())
+		if err != nil {
+			return err
 		}
 	}
 	return err