From bbce3aa26afc3d55831954231579a5456b0da61a Mon Sep 17 00:00:00 2001
From: CYPT71 <51490865+CYPT71@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:47:56 +0200
Subject: Update hardware.py

Rewrite some function

if condition is True then return true else return false, transform in return condition directly

Also I don't understand why we need a try/except at line 151 and why we not write return condition ??
---
 archinstall/lib/hardware.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'archinstall')

diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
index a63155f5..d040c19a 100644
--- a/archinstall/lib/hardware.py
+++ b/archinstall/lib/hardware.py
@@ -69,10 +69,7 @@ def has_amd_cpu() -> bool:
 
 
 def has_intel_cpu() -> bool:
-	if subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode():
-		return True
-	return False
-
+	return subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode()
 
 def has_uefi() -> bool:
 	return os.path.isdir('/sys/firmware/efi')
@@ -106,7 +103,7 @@ def cpu_vendor() -> Optional[str]:
 	for info in cpu_info:
 		if info.get('field', None) == "Vendor ID:":
 			return info.get('data', None)
-	return None
+	return
 
 
 def cpu_model() -> Optional[str]:
@@ -116,7 +113,7 @@ def cpu_model() -> Optional[str]:
 	for info in cpu_info:
 		if info.get('field', None) == "Model name:":
 			return info.get('data', None)
-	return None
+	return
 
 
 def sys_vendor() -> Optional[str]:
@@ -151,6 +148,8 @@ def virtualization() -> Optional[str]:
 
 
 def is_vm() -> bool:
+	return b"none" not in b"".join(SysCommand("systemd-detect-virt")).lower()
+	"""
 	try:
 		# systemd-detect-virt issues a non-zero exit code if it is not on a virtual machine
 		if b"none" not in b"".join(SysCommand("systemd-detect-virt")).lower():
@@ -159,5 +158,7 @@ def is_vm() -> bool:
 		pass
 
 	return False
+	
+	"""
 
 # TODO: Add more identifiers
-- 
cgit v1.2.3-70-g09d2