phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-10 19:52:50 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'delirious-lettuce-remove_platform_re' into develop

Browse source
This commit is contained in:
Micah Lee 2018-02-24 17:57:01 -08:00
commit c0ba9ab278
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
onionshare/common.py
View file

@ -23,7 +23,6 @@ import inspect
import os import os
import platform import platform
import random import random
import re
import socket import socket
import sys import sys
import tempfile import tempfile
@ -58,10 +57,11 @@ def get_platform():
Returns the platform OnionShare is running on. Returns the platform OnionShare is running on.
""" """
plat = platform.system() plat = platform.system()
if re.match('^.*BSD$', plat): if plat.endswith('BSD'):
plat = 'BSD' plat = 'BSD'
return plat return plat
def get_resource_path(filename): def get_resource_path(filename):
""" """
Returns the absolute path of a resource, regardless of whether OnionShare is installed Returns the absolute path of a resource, regardless of whether OnionShare is installed