From ebcd38ef50b334a68bdcec5cfc4bcca2f647bed6 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Mon, 7 Jan 2019 12:53:23 -0700 Subject: [PATCH] Don't change directory during initialization * Fixes issue with ddrescue-tui --- .bin/Scripts/activate.py | 3 +-- .bin/Scripts/cbs_fix.py | 3 +-- .bin/Scripts/check_disk.py | 3 +-- .bin/Scripts/connect-to-network | 3 +-- .bin/Scripts/ddrescue-tui-menu | 3 +-- .bin/Scripts/dism.py | 3 +-- .bin/Scripts/hw-diags-audio | 3 +-- .bin/Scripts/hw-diags-menu | 3 +-- .bin/Scripts/hw-diags-network | 3 +-- .bin/Scripts/hw-sensors-monitor | 3 +-- .bin/Scripts/install_sw_bundle.py | 3 +-- .bin/Scripts/install_vcredists.py | 3 +-- .bin/Scripts/mount-all-volumes | 3 +-- .bin/Scripts/mount-backup-shares | 3 +-- .bin/Scripts/msword-search | 3 +-- .bin/Scripts/safemode_enter.py | 3 +-- .bin/Scripts/safemode_exit.py | 3 +-- .bin/Scripts/sfc_scan.py | 3 +-- .bin/Scripts/system_checklist.py | 3 +-- .bin/Scripts/system_diagnostics.py | 3 +-- .bin/Scripts/transferred_keys.py | 3 +-- .bin/Scripts/update_kit.py | 3 +-- .bin/Scripts/user_checklist.py | 3 +-- .bin/Scripts/user_data_transfer.py | 3 +-- .bin/Scripts/winpe_root_menu.py | 3 +-- 25 files changed, 25 insertions(+), 50 deletions(-) diff --git a/.bin/Scripts/activate.py b/.bin/Scripts/activate.py index cf17263f..f9a9c69d 100644 --- a/.bin/Scripts/activate.py +++ b/.bin/Scripts/activate.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.activation import * init_global_vars() os.system('title {}: Windows Activation Tool'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/cbs_fix.py b/.bin/Scripts/cbs_fix.py index 460a32a5..36a7906f 100644 --- a/.bin/Scripts/cbs_fix.py +++ b/.bin/Scripts/cbs_fix.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.cleanup import * from functions.data import * init_global_vars() diff --git a/.bin/Scripts/check_disk.py b/.bin/Scripts/check_disk.py index 1140f4fc..5b0f3c14 100644 --- a/.bin/Scripts/check_disk.py +++ b/.bin/Scripts/check_disk.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.repairs import * init_global_vars() os.system('title {}: Check Disk Tool'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/connect-to-network b/.bin/Scripts/connect-to-network index 5e04e903..02500b37 100755 --- a/.bin/Scripts/connect-to-network +++ b/.bin/Scripts/connect-to-network @@ -6,8 +6,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.network import * init_global_vars() diff --git a/.bin/Scripts/ddrescue-tui-menu b/.bin/Scripts/ddrescue-tui-menu index f1f3b08c..a6014d76 100755 --- a/.bin/Scripts/ddrescue-tui-menu +++ b/.bin/Scripts/ddrescue-tui-menu @@ -6,8 +6,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.ddrescue import * from functions.hw_diags import * init_global_vars() diff --git a/.bin/Scripts/dism.py b/.bin/Scripts/dism.py index 8b227da2..2ef3ff25 100644 --- a/.bin/Scripts/dism.py +++ b/.bin/Scripts/dism.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.repairs import * init_global_vars() os.system('title {}: DISM helper Tool'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/hw-diags-audio b/.bin/Scripts/hw-diags-audio index 2c52c467..3d3a5991 100755 --- a/.bin/Scripts/hw-diags-audio +++ b/.bin/Scripts/hw-diags-audio @@ -6,8 +6,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.common import * init_global_vars() diff --git a/.bin/Scripts/hw-diags-menu b/.bin/Scripts/hw-diags-menu index 5b6f4f76..1c3cfc42 100755 --- a/.bin/Scripts/hw-diags-menu +++ b/.bin/Scripts/hw-diags-menu @@ -6,8 +6,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.hw_diags import * from functions.tmux import * init_global_vars() diff --git a/.bin/Scripts/hw-diags-network b/.bin/Scripts/hw-diags-network index 2ae0e263..3047e131 100755 --- a/.bin/Scripts/hw-diags-network +++ b/.bin/Scripts/hw-diags-network @@ -6,8 +6,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.network import * diff --git a/.bin/Scripts/hw-sensors-monitor b/.bin/Scripts/hw-sensors-monitor index 731f415e..c27d786a 100755 --- a/.bin/Scripts/hw-sensors-monitor +++ b/.bin/Scripts/hw-sensors-monitor @@ -6,8 +6,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.sensors import * from functions.tmux import * init_global_vars(silent=True) diff --git a/.bin/Scripts/install_sw_bundle.py b/.bin/Scripts/install_sw_bundle.py index 4386bfb0..b44874ae 100644 --- a/.bin/Scripts/install_sw_bundle.py +++ b/.bin/Scripts/install_sw_bundle.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.setup import * init_global_vars() os.system('title {}: SW Bundle Tool'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/install_vcredists.py b/.bin/Scripts/install_vcredists.py index 1a722bf9..a22cc729 100644 --- a/.bin/Scripts/install_vcredists.py +++ b/.bin/Scripts/install_vcredists.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.setup import * init_global_vars() os.system('title {}: Install Visual C++ Runtimes'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/mount-all-volumes b/.bin/Scripts/mount-all-volumes index 2c0a6621..f49439f2 100755 --- a/.bin/Scripts/mount-all-volumes +++ b/.bin/Scripts/mount-all-volumes @@ -6,8 +6,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.data import * init_global_vars() diff --git a/.bin/Scripts/mount-backup-shares b/.bin/Scripts/mount-backup-shares index 69374a9b..57fbe572 100755 --- a/.bin/Scripts/mount-backup-shares +++ b/.bin/Scripts/mount-backup-shares @@ -6,8 +6,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.data import * from functions.network import * init_global_vars() diff --git a/.bin/Scripts/msword-search b/.bin/Scripts/msword-search index c0461dda..b005c3c1 100755 --- a/.bin/Scripts/msword-search +++ b/.bin/Scripts/msword-search @@ -15,8 +15,7 @@ USAGE = '''Usage: {script} ... the search-terms provided (case-insensitive).'''.format(script=__file__) # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.network import * init_global_vars() diff --git a/.bin/Scripts/safemode_enter.py b/.bin/Scripts/safemode_enter.py index 027f4987..bc6d659d 100644 --- a/.bin/Scripts/safemode_enter.py +++ b/.bin/Scripts/safemode_enter.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.safemode import * init_global_vars() os.system('title {}: SafeMode Tool'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/safemode_exit.py b/.bin/Scripts/safemode_exit.py index 85376d51..bbbdbcf8 100644 --- a/.bin/Scripts/safemode_exit.py +++ b/.bin/Scripts/safemode_exit.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.safemode import * init_global_vars() os.system('title {}: SafeMode Tool'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/sfc_scan.py b/.bin/Scripts/sfc_scan.py index 9864306a..884694f5 100644 --- a/.bin/Scripts/sfc_scan.py +++ b/.bin/Scripts/sfc_scan.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.repairs import * init_global_vars() os.system('title {}: SFC Tool'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/system_checklist.py b/.bin/Scripts/system_checklist.py index 1aa95d3e..5900ef00 100644 --- a/.bin/Scripts/system_checklist.py +++ b/.bin/Scripts/system_checklist.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.activation import * from functions.cleanup import * from functions.info import * diff --git a/.bin/Scripts/system_diagnostics.py b/.bin/Scripts/system_diagnostics.py index c7b363d8..47c35eab 100644 --- a/.bin/Scripts/system_diagnostics.py +++ b/.bin/Scripts/system_diagnostics.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.browsers import * from functions.info import * from functions.product_keys import * diff --git a/.bin/Scripts/transferred_keys.py b/.bin/Scripts/transferred_keys.py index 3308844c..6dab114d 100644 --- a/.bin/Scripts/transferred_keys.py +++ b/.bin/Scripts/transferred_keys.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.product_keys import * init_global_vars() os.system('title {}: Transferred Key Finder'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py index e02acc73..3bc31a72 100644 --- a/.bin/Scripts/update_kit.py +++ b/.bin/Scripts/update_kit.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.update import * init_global_vars() os.system('title {}: Kit Update Tool'.format(KIT_NAME_FULL)) diff --git a/.bin/Scripts/user_checklist.py b/.bin/Scripts/user_checklist.py index b57e8b29..91e5915a 100644 --- a/.bin/Scripts/user_checklist.py +++ b/.bin/Scripts/user_checklist.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.browsers import * from functions.cleanup import * from functions.setup import * diff --git a/.bin/Scripts/user_data_transfer.py b/.bin/Scripts/user_data_transfer.py index 1fa06256..e63e0d7d 100644 --- a/.bin/Scripts/user_data_transfer.py +++ b/.bin/Scripts/user_data_transfer.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.data import * from functions.repairs import * init_global_vars() diff --git a/.bin/Scripts/winpe_root_menu.py b/.bin/Scripts/winpe_root_menu.py index 5a1f0f8b..a9555e07 100644 --- a/.bin/Scripts/winpe_root_menu.py +++ b/.bin/Scripts/winpe_root_menu.py @@ -4,8 +4,7 @@ import os import sys # Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) +sys.path.append(os.path.dirname(os.path.realpath(__file__))) from functions.winpe_menus import * # Fix 7-Zip name TOOLS['SevenZip'].pop('64')