move lock file to dataDir #79
This commit is contained in:
2
main.go
2
main.go
@@ -189,7 +189,7 @@ func main() {
|
|||||||
// Otherwise the command may behave in two ways:
|
// Otherwise the command may behave in two ways:
|
||||||
// 1. kill the running non-residennt instance and exit;
|
// 1. kill the running non-residennt instance and exit;
|
||||||
// 2. die if a resident instance found.
|
// 2. die if a resident instance found.
|
||||||
lockFilePath := path.Join(tempDir(), "nwg-drawer.lock")
|
lockFilePath := path.Join(dataDir(), "nwg-drawer.lock")
|
||||||
lockFile, err := singleinstance.CreateLockFile(lockFilePath)
|
lockFile, err := singleinstance.CreateLockFile(lockFilePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
pid, err := readTextFile(lockFilePath)
|
pid, err := readTextFile(lockFilePath)
|
||||||
|
|||||||
25
tools.go
25
tools.go
@@ -131,17 +131,6 @@ func cacheDir() string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func tempDir() string {
|
|
||||||
if os.Getenv("TMPDIR") != "" {
|
|
||||||
return os.Getenv("TMPDIR")
|
|
||||||
} else if os.Getenv("TEMP") != "" {
|
|
||||||
return os.Getenv("TEMP")
|
|
||||||
} else if os.Getenv("TMP") != "" {
|
|
||||||
return os.Getenv("TMP")
|
|
||||||
}
|
|
||||||
return "/tmp"
|
|
||||||
}
|
|
||||||
|
|
||||||
func readTextFile(path string) (string, error) {
|
func readTextFile(path string) (string, error) {
|
||||||
bytes, err := os.ReadFile(path)
|
bytes, err := os.ReadFile(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -177,6 +166,20 @@ func configDir() string {
|
|||||||
return dir
|
return dir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func dataDir() string {
|
||||||
|
var dir string
|
||||||
|
if os.Getenv("XDG_DATA_HOME") != "" {
|
||||||
|
dir = path.Join(os.Getenv("XDG_DATA_HOME"), "nwg-drawer")
|
||||||
|
} else if os.Getenv("HOME") != "" {
|
||||||
|
dir = path.Join(os.Getenv("HOME"), ".local/share/nwg-drawer")
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Infof("Data dir: %s", dir)
|
||||||
|
createDir(dir)
|
||||||
|
|
||||||
|
return dir
|
||||||
|
}
|
||||||
|
|
||||||
func createDir(dir string) {
|
func createDir(dir string) {
|
||||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||||
err := os.MkdirAll(dir, os.ModePerm)
|
err := os.MkdirAll(dir, os.ModePerm)
|
||||||
|
|||||||
Reference in New Issue
Block a user