More consistent use of 'normalizeOs' and 'normalizeArch'

Author: jjohannes

src/main/java/org/gradlex/javamodule/packaging/internal/HostIdentification.java

@@ -15,10 +15,10 @@ public static void validateHostSystem(String arch, String os) {
         String hostOs = hostOs();
         String hostArch = hostArch();
 
-        if (!normalizeOs(hostOs).equals(normalizeOs(os))) {
+        if (!hostOs.equals(normalizeOs(os))) {
             wrongHostSystemError(hostOs, os);
         }
-        if (!normalizeArch(hostArch).equals(normalizeArch(arch))) {
+        if (!hostArch.equals(normalizeArch(arch))) {
             wrongHostSystemError(hostArch, arch);
         }
     }
@@ -34,15 +34,15 @@ public static boolean isHostTarget(Target target) {
         return target.getOperatingSystem().isPresent()
                 && target.getArchitecture().isPresent()
                 && target.getOperatingSystem().get().equals(hostOs())
-                && target.getArchitecture().get().equals(normalizeArch(hostArch()));
+                && target.getArchitecture().get().equals(hostArch());
     }
 
     private static String hostOs() {
         return normalizeOs(System.getProperty("os.name"));
     }
 
     private static String hostArch() {
-        return System.getProperty("os.arch");
+        return normalizeArch(System.getProperty("os.arch"));
     }
 
     private static String normalizeOs(String name) {