Merge branch 'develop' into 641_fix_images_windows

This commit is contained in:
Micah Lee 2018-02-24 19:40:23 -08:00
commit 79b461d071
No known key found for this signature in database
GPG key ID: 403C2657CD994F73

View file

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