Fixing bug for arm64 (#52)

bigcat88 · web-flow · commit 22cb70987722 · 2023-01-18T23:40:36.000+02:00
* Fixing bug for arm64
diff --git a/lib/Service/UtilsService.php b/lib/Service/UtilsService.php
@@ -198,13 +198,17 @@ public function isMuslLinux(): bool {
 	}
 
 	public function getOsArch(): string {
+		$arm64_names = array("aarch64", "armv8", "arm64");
 		$machineType = php_uname('m');
 		if (str_contains($machineType, 'x86_64')) {
 			return 'amd64';
-		} elseif (str_contains($machineType, 'arm64')) { // @codeCoverageIgnoreStart
-			return 'arm64';
 		}
-		return $machineType; // @codeCoverageIgnoreEnd
+		foreach ($arm64_names as $arm64_name) {
+			if (str_contains($machineType, $arm64_name)) {
+				return 'arm64';
+			}
+		}
+		return $machineType; // probably we should log here value or raise an exception
 	}
 
 	public function getCustomAppsDirectory(): string {

Original file line number	Diff line number	Diff line change
`@@ -198,13 +198,17 @@ public function isMuslLinux(): bool {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`public function getOsArch(): string {`
	`201`	`+ $arm64_names = array("aarch64", "armv8", "arm64");`
`201`	`202`	`$machineType = php_uname('m');`
`202`	`203`	`if (str_contains($machineType, 'x86_64')) {`
`203`	`204`	`return 'amd64';`
`204`		`- } elseif (str_contains($machineType, 'arm64')) { // @codeCoverageIgnoreStart`
`205`		`- return 'arm64';`
`206`	`205`	`}`
`207`		`- return $machineType; // @codeCoverageIgnoreEnd`
	`206`	`+ foreach ($arm64_names as $arm64_name) {`
	`207`	`+ if (str_contains($machineType, $arm64_name)) {`
	`208`	`+ return 'arm64';`
	`209`	`+ }`
	`210`	`+ }`
	`211`	`+ return $machineType; // probably we should log here value or raise an exception`
`208`	`212`	`}`
`209`	`213`
`210`	`214`	`public function getCustomAppsDirectory(): string {`