From c4755124a0b9e9b69349fcc91fa2cac41bc1bbf0 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 11 Apr 2019 20:59:42 -0700 Subject: [PATCH] Remove more connect-to-network sections --- .bin/Scripts/connect-to-network | 30 ------------------------------ .bin/Scripts/functions/network.py | 21 --------------------- .bin/Scripts/settings/main.py | 3 --- 3 files changed, 54 deletions(-) delete mode 100755 .bin/Scripts/connect-to-network diff --git a/.bin/Scripts/connect-to-network b/.bin/Scripts/connect-to-network deleted file mode 100755 index 02500b37..00000000 --- a/.bin/Scripts/connect-to-network +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/python3 -# -## Wizard Kit: Network connection tool - -import os -import sys - -# Init -sys.path.append(os.path.dirname(os.path.realpath(__file__))) -from functions.network import * -init_global_vars() - -if __name__ == '__main__': - try: - # Prep - clear_screen() - - # Connect - connect_to_network() - - # Done - print_standard('\nDone.') - #pause("Press Enter to exit...") - exit_script() - except SystemExit: - pass - except: - major_exception() - -# vim: sts=2 sw=2 ts=2 diff --git a/.bin/Scripts/functions/network.py b/.bin/Scripts/functions/network.py index 492ba16f..5b5d4f52 100644 --- a/.bin/Scripts/functions/network.py +++ b/.bin/Scripts/functions/network.py @@ -15,27 +15,6 @@ REGEX_VALID_IP = re.compile( re.IGNORECASE) -def connect_to_network(): - """Connect to network if not already connected.""" - net_ifs = psutil.net_if_addrs() - net_ifs = [i[:2] for i in net_ifs.keys()] - - # Bail if currently connected - if is_connected(): - return - - # WiFi - if 'wl' in net_ifs: - cmd = [ - 'nmcli', 'dev', 'wifi', - 'connect', WIFI_SSID, - 'password', WIFI_PASSWORD] - try_and_print( - message = 'Connecting to {}...'.format(WIFI_SSID), - function = run_program, - cmd = cmd) - - def is_connected(): """Check for a valid private IP.""" devs = psutil.net_if_addrs() diff --git a/.bin/Scripts/settings/main.py b/.bin/Scripts/settings/main.py index 99011cf9..9b478feb 100644 --- a/.bin/Scripts/settings/main.py +++ b/.bin/Scripts/settings/main.py @@ -21,9 +21,6 @@ QUICKBOOKS_SERVER_IP='10.0.0.10' # Time Zones LINUX_TIME_ZONE='America/Denver' # See 'timedatectl list-timezones' for valid values WINDOWS_TIME_ZONE='Mountain Standard Time' # See 'tzutil /l' for valid values -# WiFi -WIFI_SSID='SomeWiFi' -WIFI_PASSWORD='Abracadabra' # SERVER VARIABLES ## NOTE: Windows can only use one user per server. This means that if