From a4bc08c29e2b9f27ce1cc2e5b6e274860369431a Mon Sep 17 00:00:00 2001
From: Martin Carlberg <martin@carlberg.org>
Date: Wed, 1 Sep 2021 16:27:16 +0200
Subject: [PATCH] Fixed: Moved enquote function to utils package.

This function was originally in the Narwhal package OS
---
 common.jake | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/common.jake b/common.jake
index 64c4714a4..31b1d8aca 100644
--- a/common.jake
+++ b/common.jake
@@ -126,11 +126,6 @@ function packageInCatalog(path)
     return false;
 }
 
-// from narwhal
-function enquote(word) {
-    return "'" + String(word).replace(/'/g, "'\"'\"'") + "'";
-}
-
 serializedENV = function()
 {
     var envNew = {};
@@ -147,13 +142,13 @@ serializedENV = function()
 
     if (packages.length)
     {
-        envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + enquote(p); }).join(" ");
+        envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + utilsFile.enquote(p); }).join(" ");
         envNew["PATH"] = packages.map(function(p) { return path.join(p, "bin"); }).concat(process.env["PATH"]).join(":");
     }
 
     return Object.keys(envNew).map(function(key)
     {
-        return key + "=" + enquote(envNew[key]);
+        return key + "=" + utilsFile.enquote(envNew[key]);
     }).join(" ");
 };
 
@@ -240,7 +235,7 @@ global.subjake = function(/*Array<String>*/ directories, /*String*/ aTaskName)
     {
         if (fs.lstatSync(aDirectory).isDirectory() && fs.lstatSync(path.join(aDirectory, "Jakefile")).isFile())
         {
-            var cmd = "cd " + enquote(aDirectory) + " && " + serializedENV() + " " + "jake" + " " + enquote(aTaskName);
+            var cmd = "cd " + utilsFile.enquote(aDirectory) + " && " + serializedENV() + " " + "jake" + " " + utilsFile.enquote(aTaskName);
             var returnCode = systemSync(cmd);
                 
             if (returnCode) {
@@ -431,7 +426,7 @@ var normalizeCommand = function(/*Array or String*/ command)
     if (Array.isArray(command))
         return command.map(function (arg)
         {
-            return enquote(arg);
+            return utilsFile.enquote(arg);
         }).join(" ");
     else    
         return command;