summaryrefslogtreecommitdiffstats
path: root/gallery_dl/config.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2020-04-14 18:18:40 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2020-04-14 18:18:40 -0400
commitcf188f30e1c27bdb900fa2623a9ff91b944633b2 (patch)
tree94803cd79aa8aaefd09d9bbc7b9c8029b415c885 /gallery_dl/config.py
parente4887ae6b00c50fbbde531cc274c77b076bd821d (diff)
New upstream version 1.13.4upstream/1.13.4
Diffstat (limited to 'gallery_dl/config.py')
-rw-r--r--gallery_dl/config.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/gallery_dl/config.py b/gallery_dl/config.py
index 785ffc3..c2787ad 100644
--- a/gallery_dl/config.py
+++ b/gallery_dl/config.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright 2015-2019 Mike Fährmann
+# Copyright 2015-2020 Mike Fährmann
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@@ -35,6 +35,14 @@ else:
]
+if getattr(sys, "frozen", False):
+ # look for config file in PyInstaller executable directory (#682)
+ _default_configs.append(os.path.join(
+ os.path.dirname(sys.executable),
+ "gallery-dl.conf",
+ ))
+
+
# --------------------------------------------------------------------
# public interface