working commit

pkg/auxoci/ociaux.go

@@ -7,9 +7,9 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
-func ParseOCIManifest(source []byte) (*ocispec.Manifest, error) {
+func ParseOCIManifest(rawManifest []byte) (*ocispec.Manifest, error) {
 	manifest := &ocispec.Manifest{}
-	err := json.Unmarshal(source, &manifest)
+	err := json.Unmarshal(rawManifest, &manifest)
 	if err != nil {
 		err = fmt.Errorf("Manifest parsing error: %v", err)
 		return manifest, err

pkg/auxtool/cleandir.go

@@ -1,33 +1,34 @@
 package auxtool
 
 import (
-        "path/filepath"
-        "os"
-        "strings"
+	"os"
+	"path/filepath"
+	"strings"
 )
 
+// Clean only overbase elements of dir path if possible
 func CleanDirs(basedir, datadir string) {
-        separator := string(os.PathSeparator)
+	separator := string(os.PathSeparator)
 
-        basedir = filepath.Clean(separator + basedir)
-        datadir = filepath.Clean(separator + datadir)
+	basedir = filepath.Clean(separator + basedir)
+	datadir = filepath.Clean(separator + datadir)
 
 	items := strings.Split(datadir, separator)
-        for i := len(items); i > 0; i-- {
-                p := filepath.Join(items[0:i]...)
-                p = filepath.Clean(separator + p)
-                if p == basedir {
-                        break
-                }
-                fileInfo, err := os.Stat(p)
-                if err != nil {
-                        return
-                }
-                if fileInfo.IsDir() {
-                        err = os.Remove(p)
-                        if err != nil {
-                                return
-                        }
-                }
-        }
+	for i := len(items); i > 0; i-- {
+		p := filepath.Join(items[0:i]...)
+		p = filepath.Clean(separator + p)
+		if p == basedir {
+			break
+		}
+		fileInfo, err := os.Stat(p)
+		if err != nil {
+			return
+		}
+		if fileInfo.IsDir() {
+			err = os.Remove(p)
+			if err != nil {
+				return
+			}
+		}
+	}
 }