Skip to content

Commit 9aeaafe

Browse files
committed
fix: Use 770 permissions instead of 700, fixes multi user installs #3356
1 parent 41ed718 commit 9aeaafe

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

src/apply/apply.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ func AdditionalOptions(appsFolderPath string, flags Flag) {
102102
// To use default color scheme, set `scheme` to `nil`
103103
func UserCSS(appsFolderPath, themeFolder string, scheme map[string]string) {
104104
colorsDest := filepath.Join(appsFolderPath, "xpui", "colors.css")
105-
if err := os.WriteFile(colorsDest, []byte(getColorCSS(scheme)), 0700); err != nil {
105+
if err := os.WriteFile(colorsDest, []byte(getColorCSS(scheme)), 0770); err != nil {
106106
utils.Fatal(err)
107107
}
108108
cssDest := filepath.Join(appsFolderPath, "xpui", "user.css")
109-
if err := os.WriteFile(cssDest, []byte(getUserCSS(themeFolder)), 0700); err != nil {
109+
if err := os.WriteFile(cssDest, []byte(getUserCSS(themeFolder)), 0770); err != nil {
110110
utils.Fatal(err)
111111
}
112112
}

src/cmd/apply.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func refreshThemeCSS() {
161161
os.WriteFile(
162162
filepath.Join(appDestPath, "xpui", "spicetify-config.json"),
163163
configJsonBytes,
164-
0700)
164+
0770)
165165
}
166166
}
167167

@@ -300,7 +300,7 @@ func RefreshApps(list ...string) {
300300
os.WriteFile(
301301
filepath.Join(appDestPath, "xpui", appName+".json"),
302302
manifestFileContent,
303-
0700)
303+
0770)
304304

305305
var manifestJson utils.AppManifest
306306
if err = json.Unmarshal(manifestFileContent, &manifestJson); err == nil {
@@ -368,7 +368,7 @@ func RefreshApps(list ...string) {
368368
os.WriteFile(
369369
filepath.Join(appDestPath, "xpui", appName+".js"),
370370
[]byte(jsTemplate),
371-
0700)
371+
0770)
372372

373373
cssFile := filepath.Join(customAppPath, "style.css")
374374
cssFileContent, err := os.ReadFile(cssFile)
@@ -378,7 +378,7 @@ func RefreshApps(list ...string) {
378378
os.WriteFile(
379379
filepath.Join(appDestPath, "xpui", appName+".css"),
380380
[]byte(cssFileContent),
381-
0700)
381+
0770)
382382
}
383383
}
384384

src/cmd/backup.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,17 @@ func clearBackup() {
114114
if err := os.RemoveAll(backupFolder); err != nil {
115115
utils.Fatal(err)
116116
}
117-
os.Mkdir(backupFolder, 0700)
117+
os.Mkdir(backupFolder, 0770)
118118

119119
if err := os.RemoveAll(rawFolder); err != nil {
120120
utils.Fatal(err)
121121
}
122-
os.Mkdir(rawFolder, 0700)
122+
os.Mkdir(rawFolder, 0770)
123123

124124
if err := os.RemoveAll(themedFolder); err != nil {
125125
utils.Fatal(err)
126126
}
127-
os.Mkdir(themedFolder, 0700)
127+
os.Mkdir(themedFolder, 0770)
128128

129129
backupSection.Key("version").SetValue("")
130130
backupSection.Key("with").SetValue("")

src/utils/utils.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
func CheckExistAndCreate(dir string) {
2323
_, err := os.Stat(dir)
2424
if err != nil {
25-
os.MkdirAll(dir, 0700)
25+
os.MkdirAll(dir, 0770)
2626
}
2727
}
2828

@@ -52,20 +52,20 @@ func Unzip(src, dest string) error {
5252

5353
fpath := filepath.Join(dest, f.Name)
5454
if f.FileInfo().IsDir() {
55-
os.MkdirAll(fpath, 0700)
55+
os.MkdirAll(fpath, 0770)
5656
} else {
5757
var fdir string
5858
if lastIndex := strings.LastIndex(fpath, string(os.PathSeparator)); lastIndex > -1 {
5959
fdir = fpath[:lastIndex]
6060
}
6161

62-
err = os.MkdirAll(fdir, 0700)
62+
err = os.MkdirAll(fdir, 0770)
6363
if err != nil {
6464
log.Fatal(err)
6565
return err
6666
}
6767
f, err := os.OpenFile(
68-
fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0700)
68+
fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0770)
6969
if err != nil {
7070
return err
7171
}
@@ -87,15 +87,15 @@ func Copy(src, dest string, recursive bool, filters []string) error {
8787
return err
8888
}
8989

90-
os.MkdirAll(dest, 0700)
90+
os.MkdirAll(dest, 0770)
9191

9292
for _, file := range dir {
9393
fileName := file.Name()
9494
fSrcPath := filepath.Join(src, fileName)
9595

9696
fDestPath := filepath.Join(dest, fileName)
9797
if file.IsDir() && recursive {
98-
os.MkdirAll(fDestPath, 0700)
98+
os.MkdirAll(fDestPath, 0770)
9999
if err = Copy(fSrcPath, fDestPath, true, filters); err != nil {
100100
return err
101101
}
@@ -122,7 +122,7 @@ func Copy(src, dest string, recursive bool, filters []string) error {
122122
defer fSrc.Close()
123123

124124
fDest, err := os.OpenFile(
125-
fDestPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0700)
125+
fDestPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0770)
126126
if err != nil {
127127
return err
128128
}
@@ -148,7 +148,7 @@ func CopyFile(srcPath, dest string) error {
148148
CheckExistAndCreate(dest)
149149
destPath := filepath.Join(dest, filepath.Base(srcPath))
150150
fDest, err := os.OpenFile(
151-
destPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0700)
151+
destPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0770)
152152
if err != nil {
153153
return err
154154
}
@@ -220,7 +220,7 @@ func ModifyFile(path string, repl func(string) string) {
220220

221221
content := repl(string(raw))
222222

223-
os.WriteFile(path, []byte(content), 0700)
223+
os.WriteFile(path, []byte(content), 0770)
224224
}
225225

226226
// CreateFile creates a file with given path and content.

0 commit comments

Comments
 (0)