diff --git a/scripts/extractWSA.py b/scripts/extractWSA.py index e564042..386a5aa 100644 --- a/scripts/extractWSA.py +++ b/scripts/extractWSA.py @@ -74,15 +74,16 @@ workdir_rw = os.access(workdir, os.W_OK) with zipfile.ZipFile(wsa_zip_path) as zip: for f in zip.filelist: - if arch in f.filename.lower(): + filename_lower = f.filename.lower() + if arch in filename_lower: zip_name = f.filename if not Path(workdir / zip_name).is_file(): print(f"unzipping {zip_name} to {workdir}", flush=True) zip_path = zip.extract(f, workdir) - with zipfile.ZipFile(zip_path) as zip: + with zipfile.ZipFile(zip_path) as wsa_zip: stat = Path(zip_path).stat() print(f"unzipping from {zip_path}", flush=True) - zip.extractall(archdir) + wsa_zip.extractall(archdir) ver_no = zip_name.split("_") long_ver = ver_no[1] ver = long_ver.split(".") @@ -96,7 +97,6 @@ with zipfile.ZipFile(wsa_zip_path) as zip: env.WSA_REL = rel_long with open(env_file, 'w') as environ_file: environ_file.write(str(env)) - filename_lower = f.filename.lower() if 'language' in filename_lower or 'scale' in filename_lower: name = f.filename.split("_")[2].split(".")[0] zip.extract(f, workdir)