Skip to content

Commit a8a2086

Browse files
committedAug 19, 2020
move workspace
1 parent 313603b commit a8a2086

File tree

3 files changed

+7
-25
lines changed

3 files changed

+7
-25
lines changed
 

‎README.MD

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Your language is not listed? Submit an issue to let me know.
3030
directory to get upstream. Check out a tag or commit as appropriate.
3131
1. In Nano Core 2 repository:
3232
1. Navigate to `/term` directory and run `npm install`.
33-
1. Update `/config.json` as appropriate.
33+
1. Update `/config.nano.js` as appropriate.
3434
1. Run `node ./term` to open Nano Core 2 Terminal.
3535

3636
Note: The private repository `Prototype` is required for publishing.

‎config.nano.js

+3-14
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,9 @@
9393

9494
// --------------------------------------------------------------------------------------------------------- //
9595

96-
Source: {
97-
Linux: "/tmp2/uBlock/",
98-
Win: "D:/A_Temporary/uBlock/",
99-
},
100-
101-
Target: {
102-
Linux: "/tmp2/NanoCore2DevEnv/",
103-
Win: "D:/A_Temporary/NanoCore2DevEnv/",
104-
},
105-
106-
Output: {
107-
Linux: "/tmp2/NanoCore2Latest.patch",
108-
Win: "D:/A_Temporary/NanoCore2Latest.patch",
109-
},
96+
Source: "./temp/uBlock/",
97+
Target: "./temp/NanoCore2DevEnv/",
98+
Output: "./temp/NanoCore2Latest.patch",
11099

111100
// --------------------------------------------------------------------------------------------------------- //
112101

‎term/index.js

+3-10
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ const APP_NAME = "Nano Core 2 Terminal";
3838

3939
const assert = require("assert");
4040
const fs = require("fs-extra");
41-
const os = require("os");
4241
const path = require("path");
4342

4443
const build = require("./build.js");
@@ -85,15 +84,9 @@ const config_load = async () => {
8584

8685
config.Patches = data.Patches.map((p) => path.resolve(p));
8786

88-
if (os.platform() === "win32") {
89-
config.Source = data.Source.Win;
90-
config.Target = data.Target.Win;
91-
config.Output = data.Output.Win;
92-
} else {
93-
config.Source = data.Source.Linux;
94-
config.Target = data.Target.Linux;
95-
config.Output = data.Output.Linux;
96-
}
87+
config.Source = path.resolve(data.Source);
88+
config.Target = path.resolve(data.Target);
89+
config.Output = path.resolve(data.Output);
9790

9891
const validate_path = (p) => {
9992
assert(typeof p === "string");

0 commit comments

Comments
 (0)