Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-07-26 16:15:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into ephemeral

Browse source 
Conflicts:
	onionshare/helpers.py
	onionshare/onionshare.py
This commit is contained in:
Micah Lee 2015-11-15 15:35:59 -08:00
commit fd39f84bff
11 changed files with 92 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

7
onionshare_gui/common.py
View file

@ -20,7 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import os, sys, inspect, platform
from onionshare import helpers
def get_onionshare_gui_dir():
"""
Returns the OnionShare gui directory.
"""
p = helpers.get_platform()
if p == 'Darwin':
onionshare_gui_dir = os.path.dirname(__file__)
@ -32,6 +36,9 @@ onionshare_gui_dir = get_onionshare_gui_dir()
def get_image_path(filename):
"""
Returns the OnionShare image path.
"""
p = helpers.get_platform()
if p == 'Linux' or p == 'Tails':
prefix = os.path.join(sys.prefix, 'share/onionshare/images')