Merge pull request #17 from keizer619/keizer619-patch-1

Fix user home null issue in windows
ballerina-platform · Mar 16, 2020 · 3f006c3 · 3f006c3
2 parents d1e3c89 + e0df922
commit 3f006c3
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/src/main/java/org/ballerinalang/command/util/OSUtils.java b/src/main/java/org/ballerinalang/command/util/OSUtils.java
@@ -210,20 +210,27 @@ private static boolean isSolaris() {
      */
     private static String getUserHome() {
         String userHome = System.getenv("HOME");
-        String user = System.getenv("USER");
-        String home = System.getProperty("user.home");
-        String username = System.getProperty("user.name");
 
-        if (user.equals(username)) {
-            userHome = System.getProperty("user.home");
+        if (isMac() || isWindows()) {
+            if (userHome == null) {
+                userHome = System.getProperty("user.home");
+            }
         } else {
-            // Fixes centOS issue
-            home = "/home/";
-            userHome = home + user;
-        }
-        File file = new File(userHome);
-        if (!file.exists()) {
-            throw ErrorUtil.createCommandException(file + "not exists");
+            String user = System.getenv("USER");
+            String home = System.getProperty("user.home");
+            String username = System.getProperty("user.name");
+
+            if (user.equals(username)) {
+                userHome = System.getProperty("user.home");
+            } else {
+                // Fixes centOS issue
+                home = "/home/";
+                userHome = home + user;
+            }
+            File file = new File(userHome);
+            if (!file.exists()) {
+                throw ErrorUtil.createCommandException(file + "not exists");
+            }
         }
         return userHome;
     }