aboutsummaryrefslogtreecommitdiff
path: root/desktop/src/onionshare/gui_common.py
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2020-11-08 13:34:19 -0800
committerMicah Lee <micah@micahflee.com>2020-11-08 13:34:19 -0800
commit06c4b6381bb532b2abb240a63348c6b7a77db77b (patch)
tree7f2ff01b8949243d8116992b22014cc3d7e6e07a /desktop/src/onionshare/gui_common.py
parent46a9434fbfa14b4545f7f5f12f3bd3a2cc3621c9 (diff)
downloadonionshare-06c4b6381bb532b2abb240a63348c6b7a77db77b.tar.gz
onionshare-06c4b6381bb532b2abb240a63348c6b7a77db77b.zip
Fix get_resource_path to work with python eggs, move appdata xml file to src so flatpak can see it, reduce python dependencies, and update release docs
Diffstat (limited to 'desktop/src/onionshare/gui_common.py')
-rw-r--r--desktop/src/onionshare/gui_common.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py
index a51e2641..7a32f8ec 100644
--- a/desktop/src/onionshare/gui_common.py
+++ b/desktop/src/onionshare/gui_common.py
@@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
import inspect
import shutil
+from pkg_resources import resource_filename
from . import strings
from onionshare_cli.onion import Onion
@@ -367,8 +368,4 @@ class GuiCommon:
"""
Returns the absolute path of a resource
"""
- resources_path = os.path.join(
- os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))),
- "resources",
- )
- return os.path.join(resources_path, filename)
+ return resource_filename("onionshare", os.path.join("resources", filename))