rra/Border-Check
1
0
Fork 0
mirror of https://github.com/rscmbbng/Border-Check.git synced 2024-12-27 22:31:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rscmbbng/Border-Check

Browse Source
This commit is contained in:
rscmbbng 2013-09-26 15:56:56 +02:00
commit 74e6590ca7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main.py
View File

@ -113,7 +113,6 @@ class bc(object):
Check browsers used by system Check browsers used by system
""" """
print "Browser Options:\n" + '='*45 + "\n" print "Browser Options:\n" + '='*45 + "\n"
# make browser set manually by user # make browser set manually by user
if self.options.browser: if self.options.browser:
if self.options.browser == "F" or self.options.browser == "f": # Firefox if self.options.browser == "F" or self.options.browser == "f": # Firefox
@ -248,8 +247,8 @@ class bc(object):
print "Warning: Safari hasn't been detected on your Darwin system.\n" print "Warning: Safari hasn't been detected on your Darwin system.\n"
sys.exit(2) sys.exit(2)
elif sys.platform.startswith('linux'): # on unix elif sys.platform.startswith('linux'): # on unix
self.operating_system = 'linux' self.operating_system = 'linux # check needed'
safari_lin = os.path.join(os.path.expanduser('~'), 'Library/Safari/History.plist') safari_lin = os.path.join(os.path.expanduser('~'), 'Library/Safari/History.plist') # check needed
if os.path.exists(safari_lin): if os.path.exists(safari_lin):
self.browser = "S" self.browser = "S"
if self.options.browser_history: # if exists, extract user browser's history path if self.options.browser_history: # if exists, extract user browser's history path
@ -291,7 +290,7 @@ class bc(object):
pass pass
latest_subdir = max(all_subdirs, key=os.path.getmtime) latest_subdir = max(all_subdirs, key=os.path.getmtime)
osx_profile = os.path.join(f_his_osx, latest_subdir) osx_profile = os.path.join(f_his_osx, latest_subdir)
if self.options.browser_history_history: # if exists, extract user browser's history path if self.options.browser_history: # if exists, extract user browser's history path
self.browser_history_path = self.options.browser_history self.browser_history_path = self.options.browser_history
else: else:
self.browser_history_path = os.path.join(osx_profile, 'places.sqlite') self.browser_history_path = os.path.join(osx_profile, 'places.sqlite')