Scripts cleanup

Author: gershnik

installers/common.py

@@ -19,7 +19,7 @@ def parseCommandLine() -> argparse.Namespace :
     return args
 
 def getVersion(builddir: Path):
-    verRes = subprocess.run([builddir/'wsddn', '--version'], capture_output=True, encoding='utf-8')
+    verRes = subprocess.run([builddir/'wsddn', '--version'], check=False, capture_output=True, encoding='utf-8')
     if verRes.returncode != 0:
         sys.exit(1)
     version = verRes.stdout.strip()
@@ -41,6 +41,3 @@ def copyTemplated(src, dst, map):
     dstdir.mkdir(parents=True, exist_ok=True)
     dst.write_text(src.read_text().format_map(map))
 
-# def uploadResults(installer, symfile, version):
-#     subprocess.run(['aws', 's3', 'cp', symfile, f's3://wsddn-symbols/{symfile.name}'], check=True)
-#     subprocess.run(['gh', 'release', 'upload', f'v{version}', installer], check=True)

installers/freebsd/make-toolchain.py

@@ -30,7 +30,7 @@
     print(f'no platform->arch mapping for {platform}', file=sys.stderr)
     sys.exit(1)
 
-verRes = subprocess.run(['freebsd-version'], capture_output=True, encoding='utf-8')
+verRes = subprocess.run(['freebsd-version'], check=False, capture_output=True, encoding='utf-8')
 if verRes.returncode != 0:
     sys.exit(1)
 fullVersion = verRes.stdout.strip()
@@ -71,7 +71,7 @@
         print(f'{outdir} already contains the requested toolchain')
         sys.exit(0)
     print(f'{outdir} contains non-matching existing toolchain: \n{json.dumps(info, indent=4)}\nwill overwrite')
-except (FileNotFoundError):
+except FileNotFoundError:
     pass
 
 if outdir.exists():
@@ -90,7 +90,7 @@
 procTar.wait()
 procCurl.wait()
 if procTar.returncode != 0 or procCurl.returncode != 0:
-    print(f'unpacking failed', file=sys.stderr)
+    print('unpacking failed', file=sys.stderr)
     sys.exit(1)