Merge branch 'edge'

uilicious · May 28, 2019 · f70ef38 · f70ef38
2 parents 12eea36 + be4295a
commit f70ef38
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,4 @@
 !.gitignore
 !.gitmodules
 !.npmignore
-bfg-*.jar
 node_modules
-uilicious-cli-go
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "uilicious-cli-go"]
+	path = uilicious-cli-go
+	url = [email protected]:uilicious/uilicious-cli-go.git
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "uilicious-cli",
-	"version": "2.1.2",
+	"version": "2.2.1",
 	"description": "Uilicious CLI toolchain",
 	"main": "uilicious-cli.js",
 	"//": [

diff --git a/uilicious-cli-go b/uilicious-cli-go
diff --git a/uilicious-cli.js b/uilicious-cli.js
@@ -22,16 +22,15 @@ const scriptDirectory = __dirname;
 
 // Mapping from Node's `process.arch` to Golang's `$GOARCH`
 const ARCH_MAPPING = {
-	"ia32": "386",
-	"x64": "amd64",
-	// "arm": "arm"
+    "ia32": "386",
+    "x64": "amd64"
 };
 
 // Mapping between Node's `process.platform` to Golang's 
 const PLATFORM_MAPPING = {
-	"darwin": "darwin",
-	"linux": "linux",
-	"win32": "windows"
+    "darwin": "darwin",
+    "linux": "linux",
+    "win32": "windows"
 };
 
 if (!(process.arch in ARCH_MAPPING)) {