Fix whoami returning root

Author: tsvetie

lib/mac.json

@@ -10,5 +10,6 @@
     "getPATHCommand": "",
     "getPrefixPathCommand": "npm config get prefix",
     "getCachePathCommand": "npm config get cache",
-    "fixNPMPermissionsCommand": "chown -R $(whoami) %{0}"
+    "getCurrentUserCommand": "whoami",
+    "fixNPMPermissionsCommand": "chown -R %{0} %{1}"
 }

lib/permissions-service.js

@@ -6,7 +6,7 @@ module.exports = (helpers, config) => {
     const npmPrefixPathSuffixes = ["/lib/node_modules", "/lib/bin", "/lib/share"];
 
     const { logMessage, execSync, sudoExec, stringFormat } = helpers;
-    const { getPrefixPathCommand, getCachePathCommand, fixNPMPermissionsCommand } = config;
+    const { getPrefixPathCommand, getCachePathCommand, getCurrentUserCommand, fixNPMPermissionsCommand } = config;
 
     const getNPMFoldersWithMissingPermissions = (stderr) => {
         if (_.isEmpty(getPrefixPathCommand) || _.isEmpty(getCachePathCommand) || !eaccessCodeString.test(stderr)) {
@@ -47,6 +47,24 @@ module.exports = (helpers, config) => {
         return folders;
     };
 
+    const getCurrentUser = () => {
+        if (_.isEmpty(getCurrentUserCommand)) {
+            return "";
+        }
+
+        let currentUser = "";
+
+        try {
+            currentUser = execSync(getCurrentUserCommand);
+        } catch (error) {
+            logMessage(`Get current user failed. Error:\n${error}`);
+
+            currentUser = "";
+        }
+
+        return currentUser;
+    };
+
     const fixMissingNPMPermissions = (folderPaths) => {
         if (_.isEmpty(folderPaths)) {
             logMessage("No folders with incorrect permissions.");
@@ -60,11 +78,19 @@ module.exports = (helpers, config) => {
             return Promise.resolve();
         }
 
+        const currentUser = getCurrentUser();
+
+        if (_.isEmpty(currentUser)) {
+            logMessage("No current user.");
+
+            return Promise.resolve();
+        }
+
         const folderExpression = _.chain(folderPaths)
             .map(folderPath => `'${folderPath}'`)
             .join(" ")
             .value();
-        const command = stringFormat(fixNPMPermissionsCommand, folderExpression);
+        const command = stringFormat(fixNPMPermissionsCommand, currentUser, folderExpression);
 
         return sudoExec(command);
     };

lib/windows.json

@@ -10,5 +10,6 @@
     "getPATHCommand": "echo %PATH%",
     "getPrefixPathCommand": "",
     "getCachePathCommand": "",
+    "getCurrentUser": "",
     "fixNPMPermissionsCommand": ""
 }