From 2fd5dd28d9ee152c5ecb40872b15ab2ebca39d02 Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Mon, 4 Dec 2017 15:14:19 -0800 Subject: [PATCH 1/3] Removed compress_bin.cmd No longer used --- .bin/Scripts/compress_bin.cmd | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .bin/Scripts/compress_bin.cmd diff --git a/.bin/Scripts/compress_bin.cmd b/.bin/Scripts/compress_bin.cmd deleted file mode 100644 index e29b6445..00000000 --- a/.bin/Scripts/compress_bin.cmd +++ /dev/null @@ -1,28 +0,0 @@ -@echo off - -setlocal enabledelayedexpansion -pushd "%~dp0" - -rem Prep -mkdir _out\_Drivers -set "out=%cd%\_out" - -rem _Drivers -pushd _Drivers -for %%f in (*) do ( - set "file=%%f" - "%programfiles%\7-Zip\7z.exe" a -t7z -mx=9 -myx=9 -ms=on -mhe -pAbracadabra "%out%\_Drivers\!file:~0,-4!.7z" "%%f" -) -popd - -rem Rest -for /d %%d in (*) do ( - if not "%%d" == "_out" ( - pushd "%%d" - "%programfiles%\7-Zip\7z.exe" a -t7z -mx=9 -myx=9 -ms=on -mhe -pAbracadabra "%out%\%%d.7z" * - popd - ) -) - -popd -endlocal \ No newline at end of file From 5d7cad37e4fb6fff93baac4faf6263a2b814344d Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Wed, 6 Dec 2017 12:50:34 -0800 Subject: [PATCH 2/3] Bugfix: Prevent crash when checking Office/QuickBooks network installers --- .bin/Scripts/functions/update.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index 4531b406..ad1cf00e 100644 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -164,7 +164,11 @@ def scan_for_net_installers(server, family_name, min_year): if server['Mounted']: for year in os.scandir(r'\\{IP}\{Share}'.format(**server)): - if int(year.name) < min_year: + try: + year_ok = int(year.name) < min_year + except ValueError: + year_ok = False # Skip non-year items + if year_ok: # Don't support outdated installers continue for version in os.scandir(year.path): From 6ff8d76b59087694cc486da3a166239df448bea1 Mon Sep 17 00:00:00 2001 From: Alan Mason <1923621+2Shirt@users.noreply.github.com> Date: Wed, 6 Dec 2017 13:23:28 -0800 Subject: [PATCH 3/3] Write logs in UTF-8 Fixes #6 --- .bin/Scripts/functions/common.py | 7 ++++--- .bin/Scripts/functions/data.py | 6 +++--- .bin/Scripts/functions/info.py | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py index 33090411..4f03205a 100644 --- a/.bin/Scripts/functions/common.py +++ b/.bin/Scripts/functions/common.py @@ -160,7 +160,8 @@ def get_ticket_number(): _input = input('Enter ticket number: ') if re.match(r'^([0-9]+([-_]?\w+|))$', _input): ticket_number = _input - with open(r'{LogDir}\TicketNumber'.format(**global_vars), 'w') as f: + with open(r'{}\TicketNumber'.format(global_vars['LogDir']), 'w', + encoding='utf-8') as f: f.write(ticket_number) return ticket_number @@ -341,7 +342,7 @@ def print_warning(*args, **kwargs): def print_log(message='', end='\n', timestamp=True): time_str = time.strftime("%Y-%m-%d %H%M%z: ") if timestamp else '' if 'LogFile' in global_vars and global_vars['LogFile'] is not None: - with open(global_vars['LogFile'], 'a') as f: + with open(global_vars['LogFile'], 'a', encoding='utf-8') as f: for line in message.splitlines(): f.write('{timestamp}{line}{end}'.format( timestamp = time_str, @@ -481,7 +482,7 @@ def upload_data(path, file): winreg.REG_SZ, CLIENT_INFO_SERVER['RegEntry']) # Write batch file - with open(r'{TmpDir}\psftp.batch'.format(**global_vars), + with open(r'{}\psftp.batch'.format(global_vars['TmpDir']), 'w', encoding='ascii') as f: f.write('lcd "{path}"\n'.format(path=path)) f.write('cd "{Share}"\n'.format(**CLIENT_INFO_SERVER)) diff --git a/.bin/Scripts/functions/data.py b/.bin/Scripts/functions/data.py index d02af97d..8703aaea 100644 --- a/.bin/Scripts/functions/data.py +++ b/.bin/Scripts/functions/data.py @@ -197,8 +197,7 @@ def run_fast_copy(items, dest): raise Exception cmd = [global_vars['Tools']['FastCopy'], *FAST_COPY_ARGS] - if 'LogFile' in global_vars: - cmd.append('/logfile={LogFile}'.format(**global_vars)) + cmd.append(r'/logfile={}\FastCopy.log'.format(global_vars['LogDir'])) cmd.extend(items) cmd.append('/to={}\\'.format(dest)) @@ -211,7 +210,8 @@ def run_wimextract(source, items, dest): extract_item('wimlib', silent=True) # Write files.txt - with open(r'{}\wim_files.txt'.format(global_vars['TmpDir']), 'w') as f: + with open(r'{}\wim_files.txt'.format(global_vars['TmpDir']), 'w', + encoding='utf-8') as f: # Defaults for item in items: f.write('{}\n'.format(item)) diff --git a/.bin/Scripts/functions/info.py b/.bin/Scripts/functions/info.py index 0c67abb9..c636a0f7 100644 --- a/.bin/Scripts/functions/info.py +++ b/.bin/Scripts/functions/info.py @@ -345,11 +345,13 @@ def run_bleachbit(): out = run_program(cmd, check=False) # Save stderr if out.stderr.decode().splitlines(): - with open(global_vars['LogDir']+r'\BleachBit.err', 'a') as f: + with open(global_vars['LogDir']+r'\BleachBit.err', 'a', + encoding='utf-8') as f: for line in out.stderr.decode().splitlines(): f.write(line.strip() + '\n') # Save stdout - with open(global_vars['LogDir']+r'\BleachBit.log', 'a') as f: + with open(global_vars['LogDir']+r'\BleachBit.log', 'a', + encoding='utf-8') as f: for line in out.stdout.decode().splitlines(): f.write(line.strip() + '\n')