From b1b5c5052d8a915fd7f37027f8b9b92fffb4b393 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sun, 21 Jan 2018 13:52:34 +0100 Subject: [PATCH] add new lines at the end --- .../anon_connection_wizard/anon_connection_wizard.py | 2 ++ .../dist-packages/anon_connection_wizard/repair_torrc.py | 4 +++- .../dist-packages/anon_connection_wizard/tor_status.py | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/usr/lib/python3/dist-packages/anon_connection_wizard/anon_connection_wizard.py b/usr/lib/python3/dist-packages/anon_connection_wizard/anon_connection_wizard.py index 9bc159f..357f45b 100644 --- a/usr/lib/python3/dist-packages/anon_connection_wizard/anon_connection_wizard.py +++ b/usr/lib/python3/dist-packages/anon_connection_wizard/anon_connection_wizard.py @@ -1453,6 +1453,8 @@ def io(self): # for proxy in proxies['proxies'][Common.well_known_proxy_setting]: # f.write('{0}\n'.format(proxy)) + f.write('\n') + def parseTorrc(self): if os.path.exists(Common.torrc_file_path): diff --git a/usr/lib/python3/dist-packages/anon_connection_wizard/repair_torrc.py b/usr/lib/python3/dist-packages/anon_connection_wizard/repair_torrc.py index a0c876d..8e18e94 100644 --- a/usr/lib/python3/dist-packages/anon_connection_wizard/repair_torrc.py +++ b/usr/lib/python3/dist-packages/anon_connection_wizard/repair_torrc.py @@ -12,13 +12,14 @@ whonix=True else: whonix=False - + def repair_torrc(): repair_torrc_d() if not os.path.exists('/etc/tor/torrc'): with open('/etc/tor/torrc', "w+") as f: f.write("%include /etc/torrc.d") + f.write('\n') else: with open('/etc/tor/torrc', "r") as f: lines = f.readlines() @@ -33,6 +34,7 @@ def repair_torrc(): if not torrcd_line_exists: with open('/etc/tor/torrc', "a") as f: f.write("%include /etc/torrc.d\n") + f.write('\n') '''repair_torrc_d() will gurantee the existence of /etc/torrc.d diff --git a/usr/lib/python3/dist-packages/anon_connection_wizard/tor_status.py b/usr/lib/python3/dist-packages/anon_connection_wizard/tor_status.py index f37838e..4140d35 100644 --- a/usr/lib/python3/dist-packages/anon_connection_wizard/tor_status.py +++ b/usr/lib/python3/dist-packages/anon_connection_wizard/tor_status.py @@ -58,6 +58,7 @@ def set_enabled(): if status == "no_torrc": with open(DisableNetwork_torrc_path,'w+') as f: f.write('DisableNetwork 0') + f.write('\n') elif status == "tor_disabled": for i, line in enumerate(fileinput.input(DisableNetwork_torrc_path, inplace=1)): sys.stdout.write(line.replace('DisableNetwork 1', 'DisableNetwork 0')) @@ -67,6 +68,7 @@ def set_enabled(): elif status == "missing_disablenetwork_line": with open(DisableNetwork_torrc_path,'a') as f: f.write('DisableNetwork 0') + f.write('\n') ## start the Tor now command = 'systemctl --no-pager restart tor@default' @@ -89,6 +91,7 @@ def set_disabled(): if status == "no_torrc": with open(DisableNetwork_torrc_path,'w+') as f: f.write('DisableNetwork 1') + f.write('\n') elif status == "tor_disabled": # do nothing pass @@ -98,6 +101,7 @@ def set_disabled(): elif status == "missing_disablenetwork_line": with open(DisableNetwork_torrc_path,'a') as f: f.write('DisableNetwork 1') + f.write('\n') ## stop the Tor now command = 'systemctl --no-pager stop tor@default'