fix homedir handling and zip dir creation

bakito · Sep 23, 2022 · 127ca61 · 127ca61
1 parent d3f9d8c
commit 127ca61
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/main.go b/main.go
@@ -285,9 +285,9 @@ func readToolbox() (*types.Toolbox, error) {
 			return nil, err
 		}
 
-		tbFile = filepath.Join(userHomeDir, toolboxConfFile)
-		if _, err := os.Stat(tbFile); err != nil {
-			return nil, err
+		homePath := filepath.Join(userHomeDir, toolboxConfFile)
+		if _, err := os.Stat(tbFile); err == nil {
+			tbFile = homePath
 		}
 	}
 	log.Printf("Reading config %s\n", tbFile)

diff --git a/pkg/extract/extract.go b/pkg/extract/extract.go
@@ -8,7 +8,6 @@ import (
 	"io"
 	"log"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
@@ -59,7 +58,8 @@ func unzipFile(file *zip.File, target string) error {
 	if err != nil {
 		return err
 	}
-	_ = os.MkdirAll(path.Dir(name), os.ModeDir)
+	parent, _ := filepath.Split(name)
+	_ = os.MkdirAll(parent, os.ModeDir)
 	create, err := os.Create(name)
 	if err != nil {
 		return err