cleanups
This commit is contained in:
@@ -320,6 +320,13 @@ def ensure_minimum_nodejs(min_version=MIN_NODEJS_VERSION):
|
|||||||
if match:
|
if match:
|
||||||
current_major = int(match.group(1))
|
current_major = int(match.group(1))
|
||||||
if current_major >= min_version:
|
if current_major >= min_version:
|
||||||
|
|
||||||
|
if shutil.which("npm"):
|
||||||
|
npm_ver = run_out(["npm", "--version"], check=False).strip()
|
||||||
|
print(f"Node.js: {node_ver}")
|
||||||
|
print(f" npm: {npm_ver}")
|
||||||
|
else:
|
||||||
|
print(f"Node.js: {node_ver}")
|
||||||
return True
|
return True
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
pass
|
pass
|
||||||
@@ -1057,7 +1064,7 @@ def install_node_from_nodesource(version: str):
|
|||||||
|
|
||||||
if shutil.which("npm"):
|
if shutil.which("npm"):
|
||||||
npm_ver = run_out(["npm", "--version"], check=False).strip()
|
npm_ver = run_out(["npm", "--version"], check=False).strip()
|
||||||
print(f"✔ npm {npm_ver} installed successfully")
|
print(f"\n✔ npm {npm_ver} installed successfully")
|
||||||
else:
|
else:
|
||||||
print(f"✖ npm could not be installed - manual intervention required")
|
print(f"✖ npm could not be installed - manual intervention required")
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user