Merge pull request #1637 from ProfoundLogic/master

implausible · web-flow · commit 4dc14ce96bfc · 2019-02-20T09:17:33.000-07:00
Simplify check for IBM i operating system
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
@@ -1,7 +1,7 @@
 {
   "variables": {
     "is_electron%": "<!(node ./utils/isBuildingForElectron.js <(node_root_dir))",
-    "is_IBMi%": "<!(node ./utils/isBuildingForIBMi.js)"
+    "is_IBMi%": "<!(node -p \"os.platform() == 'aix' && os.type() == 'OS400' ? 1 : 0\")"
   },
 
   "targets": [
diff --git a/utils/isBuildingForIBMi.js b/utils/isBuildingForIBMi.js
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -9,7 +9,7 @@
     "gcc_version%": 0,
     "is_electron%": "<!(node ../utils/isBuildingForElectron.js <(node_root_dir))",
     "is_clang%": 0,
-    "is_IBMi%": "<!(node ../utils/isBuildingForIBMi.js)"
+    "is_IBMi%": "<!(node -p \"os.platform() == 'aix' && os.type() == 'OS400' ? 1 : 0\")"
   },
   "targets": [
     {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"variables": {`
`3`	`3`	`"is_electron%": "<!(node ./utils/isBuildingForElectron.js <(node_root_dir))",`
`4`		`- "is_IBMi%": "<!(node ./utils/isBuildingForIBMi.js)"`
	`4`	`+ "is_IBMi%": "<!(node -p \"os.platform() == 'aix' && os.type() == 'OS400' ? 1 : 0\")"`
`5`	`5`	`},`
`6`	`6`
`7`	`7`	`"targets": [`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"gcc_version%": 0,`
`10`	`10`	`"is_electron%": "<!(node ../utils/isBuildingForElectron.js <(node_root_dir))",`
`11`	`11`	`"is_clang%": 0,`
`12`		`- "is_IBMi%": "<!(node ../utils/isBuildingForIBMi.js)"`
	`12`	`+ "is_IBMi%": "<!(node -p \"os.platform() == 'aix' && os.type() == 'OS400' ? 1 : 0\")"`
`13`	`13`	`},`
`14`	`14`	`"targets": [`
`15`	`15`	`{`