Merge pull request #24 from Equanox/fix_permissions

fix permission bug with .gotron dir
Equanox · Feb 12, 2019 · 3cb89ba · 3cb89ba
2 parents 621452f + c251fc8
commit 3cb89ba
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -56,7 +56,7 @@ release:
 	-a cmd/gotron-builder/main.go
 
 	@GOOS=windows GOARCH=amd64 CGO_ENABLED=0 \
-	go build -o ./release/gotron-builder-amd64-win \
+	go build -o ./release/gotron-builder-amd64-win.exe \
 	-ldflags="-X main.gotronBuilderVersion=$(VERSION)" \
 	-a cmd/gotron-builder/main.go
 

diff --git a/gotron_methods.go b/gotron_methods.go
@@ -56,11 +56,14 @@ func (gbw *BrowserWindow) CreateAppStructure(forceInstall ...bool) (err error) {
 	}
 	defer errz.Recover(&err)
 
-	//Copy Electron Files
+	err = os.MkdirAll(gbw.AppDirectory, 0777)
+	errz.Fatal(err)
+
+	// Copy Electron Files
 	err = gbw.copyElectronApplication(_forceInstall)
 	errz.Fatal(err)
 
-	//Run npm install
+	// Run npm install
 	err = gbw.runNPM(_forceInstall)
 	errz.Fatal(err)
 
@@ -139,15 +142,15 @@ func (gbw *BrowserWindow) copyElectronApplication(forceInstall bool) (err error)
 	src, err := filepath.Abs(gbw.UIFolder)
 	errz.Fatal(err)
 	dst, err := filepath.Abs(filepath.Join(gbw.AppDirectory, "assets"))
- 	errz.Fatal(err)
- 
- 	if src != dst {
- 		err = os.RemoveAll(filepath.Join(gbw.AppDirectory, "assets"))
- 		errz.Fatal(err)
- 
- 		err = copy.Copy(gbw.UIFolder, filepath.Join(gbw.AppDirectory, "assets"))
- 		errz.Fatal(err)
- 	}
+	errz.Fatal(err)
+
+	if src != dst {
+		err = os.RemoveAll(filepath.Join(gbw.AppDirectory, "assets"))
+		errz.Fatal(err)
+
+		err = copy.Copy(gbw.UIFolder, filepath.Join(gbw.AppDirectory, "assets"))
+		errz.Fatal(err)
+	}
 
 	return nil
 }