Browse Source

idk how settings was added in CI

SaltyMonkey 6 years ago
parent
commit
f8c60cdabc
3 changed files with 13 additions and 5 deletions
  1. 4 3
      .manifest.js
  2. 8 1
      manifest.json
  3. 1 1
      settings/settings.json

+ 4 - 3
.manifest.js

@@ -3,15 +3,16 @@ const crypto = require("crypto");
 const fs = require("fs");
 const fs = require("fs");
 const path = require("path");
 const path = require("path");
 
 
-const IGNORED_FILES = ["manifest.json", "settings.json", "manifest-generator.js", "manifest-generator.bat", "manifest-generator.exe", "node.exe"];
+const IGNORED_FILES = ["manifest.json", "manifest-generator.js", "manifest-generator.bat", "manifest-generator.exe", "node.exe"];
 const IGNORED_START_SYMBOL = [".", "_"];
 const IGNORED_START_SYMBOL = [".", "_"];
 
 
 //load predefined manifest
 //load predefined manifest
 let manifest = undefined;
 let manifest = undefined;
 try {
 try {
-	manifest = require("manifest.json");
-	if (manifest && typeof manifest === "object")
+	manifest = require("./manifest.json");
+	if (manifest && typeof manifest === "object") {
 		if (!manifest.files) manifest.files = {};
 		if (!manifest.files) manifest.files = {};
+	}
 	else manifest = { "files": {} };
 	else manifest = { "files": {} };
 }
 }
 catch (err) { manifest = { "files": {} };}
 catch (err) { manifest = { "files": {} };}

+ 8 - 1
manifest.json

@@ -36,6 +36,13 @@
 		"node_modules/rfdc/test/index.js": "89c8b6631df835a01305a62ebf6ae94feb4381bcc8083fcd30bd4a394f3e5e17",
 		"node_modules/rfdc/test/index.js": "89c8b6631df835a01305a62ebf6ae94feb4381bcc8083fcd30bd4a394f3e5e17",
 		"package-lock.json": "8144ce4f835c870e89d7b86960428bb144fc0976b7fe08ca0259c916b110a1f8",
 		"package-lock.json": "8144ce4f835c870e89d7b86960428bb144fc0976b7fe08ca0259c916b110a1f8",
 		"package.json": "ee7789302749d6de0b4a3fc76d4d7d96708262ca6125527c87741aa020096a67",
 		"package.json": "ee7789302749d6de0b4a3fc76d4d7d96708262ca6125527c87741aa020096a67",
-		"settings/presets/common.json": "b7336ffddf763895537d8ad6992c3aeec5f88ddf8848eecdfd56d421bf2b7529"
+		"settings/presets/common.json": {
+			"overwrite": false,
+			"hash": "b7336ffddf763895537d8ad6992c3aeec5f88ddf8848eecdfd56d421bf2b7529"
+		},
+		"settings/settings.json": {
+			"overwrite": false,
+			"hash": "ee60c698b8b58aa009393ab12ae7d41475a70bf345bbfc210ac550cd5b751f5f"
+		}
 	}
 	}
 }
 }

+ 1 - 1
settings/settings.json

@@ -1,7 +1,7 @@
 {
 {
 	"registerCommands": true,
 	"registerCommands": true,
 	"customCommandsTag": "",
 	"customCommandsTag": "",
-	"interactive": true,
+	"interactive": false,
 	"debugMode": false,
 	"debugMode": false,
 	"classBasedPresets": true,
 	"classBasedPresets": true,
 	"enableEvents": true,
 	"enableEvents": true,