macOS var data location
This commit is contained in:
parent
5c1ce5302a
commit
8258da2e46
1 changed files with 18 additions and 5 deletions
|
@ -2,6 +2,7 @@ import argparse
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import locale
|
import locale
|
||||||
|
import re
|
||||||
import ConfigParser
|
import ConfigParser
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,11 +61,23 @@ class Config(object):
|
||||||
else:
|
else:
|
||||||
fix_float_decimals = False
|
fix_float_decimals = False
|
||||||
|
|
||||||
if __file__.replace("\\", "/").endswith("core/src/Config.py"):
|
if __file__.endswith("/Contents/Resources/core/src/Config.py"):
|
||||||
# Probably running as exe form, put var files to outside of Include dir
|
# Running as ZeroNet.app
|
||||||
config_file = "../zeronet.conf"
|
if __file__.startswith("/Application") or __file__.startswith("/private"):
|
||||||
data_dir = "../data"
|
# Runnig from non-writeable directory, put data to Application Support
|
||||||
log_dir = "../log"
|
start_dir = os.path.expanduser("~/Library/Application Support/ZeroNet")
|
||||||
|
else:
|
||||||
|
# Running from writeable directory put data next to .app
|
||||||
|
start_dir = re.sub("/[^/]+/Contents/Resources/core/src/Config.py", "", __file__)
|
||||||
|
config_file = start_dir + "/zeronet.conf"
|
||||||
|
data_dir = start_dir + "/data"
|
||||||
|
log_dir = start_dir + "/log"
|
||||||
|
elif __file__.replace("\\", "/").endswith("/core/src/Config.py"):
|
||||||
|
# Running as exe or source is at Application Support directory, put var files to outside of core dir
|
||||||
|
start_dir = __file__.replace("/core/src/Config.py", "")
|
||||||
|
config_file = start_dir + "/zeronet.conf"
|
||||||
|
data_dir = start_dir + "/data"
|
||||||
|
log_dir = start_dir + "/log"
|
||||||
else:
|
else:
|
||||||
config_file = "zeronet.conf"
|
config_file = "zeronet.conf"
|
||||||
data_dir = "data"
|
data_dir = "data"
|
||||||
|
|
Loading…
Reference in a new issue