Skip to content

Commit 3cb89ba

Browse files
authored
Merge pull request #24 from Equanox/fix_permissions
fix permission bug with .gotron dir
2 parents 621452f + c251fc8 commit 3cb89ba

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ release:
5656
-a cmd/gotron-builder/main.go
5757

5858
@GOOS=windows GOARCH=amd64 CGO_ENABLED=0 \
59-
go build -o ./release/gotron-builder-amd64-win \
59+
go build -o ./release/gotron-builder-amd64-win.exe \
6060
-ldflags="-X main.gotronBuilderVersion=$(VERSION)" \
6161
-a cmd/gotron-builder/main.go
6262

gotron_methods.go

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,14 @@ func (gbw *BrowserWindow) CreateAppStructure(forceInstall ...bool) (err error) {
5656
}
5757
defer errz.Recover(&err)
5858

59-
//Copy Electron Files
59+
err = os.MkdirAll(gbw.AppDirectory, 0777)
60+
errz.Fatal(err)
61+
62+
// Copy Electron Files
6063
err = gbw.copyElectronApplication(_forceInstall)
6164
errz.Fatal(err)
6265

63-
//Run npm install
66+
// Run npm install
6467
err = gbw.runNPM(_forceInstall)
6568
errz.Fatal(err)
6669

@@ -139,15 +142,15 @@ func (gbw *BrowserWindow) copyElectronApplication(forceInstall bool) (err error)
139142
src, err := filepath.Abs(gbw.UIFolder)
140143
errz.Fatal(err)
141144
dst, err := filepath.Abs(filepath.Join(gbw.AppDirectory, "assets"))
142-
errz.Fatal(err)
143-
144-
if src != dst {
145-
err = os.RemoveAll(filepath.Join(gbw.AppDirectory, "assets"))
146-
errz.Fatal(err)
147-
148-
err = copy.Copy(gbw.UIFolder, filepath.Join(gbw.AppDirectory, "assets"))
149-
errz.Fatal(err)
150-
}
145+
errz.Fatal(err)
146+
147+
if src != dst {
148+
err = os.RemoveAll(filepath.Join(gbw.AppDirectory, "assets"))
149+
errz.Fatal(err)
150+
151+
err = copy.Copy(gbw.UIFolder, filepath.Join(gbw.AppDirectory, "assets"))
152+
errz.Fatal(err)
153+
}
151154

152155
return nil
153156
}

0 commit comments

Comments
 (0)