oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix start dir parsing for command line and better description

Browse source
This commit is contained in:
shortcutme 2020-02-20 17:25:06 +01:00
parent 1cc0ec3f31
commit a9c75a3146
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Config.py
View file

@ -29,7 +29,6 @@ class Config(object):
]) ])
self.start_dir = self.getStartDir() self.start_dir = self.getStartDir()
self.openssl_path = "default"
self.config_file = self.start_dir + "/zeronet.conf" self.config_file = self.start_dir + "/zeronet.conf"
self.data_dir = self.start_dir + "/data" self.data_dir = self.start_dir + "/data"
self.log_dir = self.start_dir + "/log" self.log_dir = self.start_dir + "/log"
@ -56,7 +55,9 @@ class Config(object):
def getStartDir(self): def getStartDir(self):
this_file = os.path.abspath(__file__).replace("\\", "/").rstrip("cd") this_file = os.path.abspath(__file__).replace("\\", "/").rstrip("cd")
if this_file.endswith("/Contents/Resources/core/src/Config.py"): if "--start_dir" in self.argv:
start_dir = self.argv[self.argv.index("--start_dir") + 1]
elif this_file.endswith("/Contents/Resources/core/src/Config.py"):
# Running as ZeroNet.app # Running as ZeroNet.app
if this_file.startswith("/Application") or this_file.startswith("/private") or this_file.startswith(os.path.expanduser("~/Library")): if this_file.startswith("/Application") or this_file.startswith("/private") or this_file.startswith(os.path.expanduser("~/Library")):
# Runnig from non-writeable directory, put data to Application Support # Runnig from non-writeable directory, put data to Application Support
@ -109,7 +110,6 @@ class Config(object):
else: else:
fix_float_decimals = False fix_float_decimals = False
start_dir = self.start_dir
config_file = self.start_dir + "/zeronet.conf" config_file = self.start_dir + "/zeronet.conf"
data_dir = self.start_dir + "/data" data_dir = self.start_dir + "/data"
log_dir = self.start_dir + "/log" log_dir = self.start_dir + "/log"
@ -224,7 +224,7 @@ class Config(object):
self.parser.add_argument('--batch', help="Batch mode (No interactive input for commands)", action='store_true') self.parser.add_argument('--batch', help="Batch mode (No interactive input for commands)", action='store_true')
self.parser.add_argument('--start_dir', help='Start Directory of ZeroNet(Usually dir where zeronet.py Exists)',default=start_dir, metavar="path") self.parser.add_argument('--start_dir', help='Path of working dir for variable content (data, log, .conf)', default=self.start_dir, metavar="path")
self.parser.add_argument('--config_file', help='Path of config file', default=config_file, metavar="path") self.parser.add_argument('--config_file', help='Path of config file', default=config_file, metavar="path")
self.parser.add_argument('--data_dir', help='Path of data directory', default=data_dir, metavar="path") self.parser.add_argument('--data_dir', help='Path of data directory', default=data_dir, metavar="path")