Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-26 01:11:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Simplify flatpak detection

Browse Source
This commit is contained in:
Micah Lee 2020-06-30 14:53:38 -07:00
parent 7b5c8e8b31
commit 25cb1c19f4
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
onionshare_gui/gui_common.py
View File

@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
import os import os
import json
from onionshare import strings from onionshare import strings
from onionshare.onion import Onion from onionshare.onion import Onion
@ -39,16 +38,7 @@ class GuiCommon:
self.local_only = local_only self.local_only = local_only
# Are we running in a flatpak package? # Are we running in a flatpak package?
self.is_flatpak = False self.is_flatpak = os.path.exists("/.flatpak-info")
if os.path.exists("/app/manifest.json"):
try:
with open("/app/manifest.json") as f:
manifest_data = json.loads(f.read())
if manifest_data["id"] == "org.onionshare.OnionShare":
self.is_flatpak = True
self.common.log("GuiCommon", "__init__", "is_flatpak=True")
except:
pass
# Load settings # Load settings
self.common.load_settings() self.common.load_settings()