Instance creation with external instance paths are now working

This commit is contained in:
Daniel Vestøl committed 2018-07-15 17:43:26 +02:00
1 parent 724248b09b
commit e73a6052fe
2 files changed
+13 -13

No files matched your search

+12 -12
View File
@@ -274,7 +274,7 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
`); `);
// this line is probably not needed anymore but Im not gonna remove it // this line is probably not needed anymore but Im not gonna remove it
fs.copySync('sharedMods', instancedirectory + "/mods"); fs.copySync('sharedMods', path.join(instancedirectory, "mods"));
let instconf = { let instconf = {
"factorioPort": args.port || process.env.FACTORIOPORT || Math.floor(Math.random() * 65535), "factorioPort": args.port || process.env.FACTORIOPORT || Math.floor(Math.random() * 65535),
"clientPort": args["rcon-port"] || process.env.RCONPORT || Math.floor(Math.random() * 65535), "clientPort": args["rcon-port"] || process.env.RCONPORT || Math.floor(Math.random() * 65535),
@@ -310,8 +310,8 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
fs.writeFileSync(instancedirectory + "/server-settings.json", JSON.stringify(serversettings, null, 4)); fs.writeFileSync(instancedirectory + "/server-settings.json", JSON.stringify(serversettings, null, 4));
let createSave = child_process.spawnSync( let createSave = child_process.spawnSync(
'./' + config.factorioDirectory + '/bin/x64/factorio', [ './' + config.factorioDirectory + '/bin/x64/factorio', [
'-c', path.resolve(instancedirectory, '/config.ini'), '-c', path.resolve(instancedirectory, 'config.ini'),
'--create', instancedirectory + '/saves/save.zip', '--create', path.resolve(instancedirectory, 'saves', 'save.zip'),
] ]
); );
console.log("Instance created!"); console.log("Instance created!");
@@ -331,17 +331,17 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
process.exit(1); process.exit(1);
} }
console.log("Deleting .tmp.zip files"); console.log("Deleting .tmp.zip files");
let savefiles = fs.readdirSync(instancedirectory + "/saves/"); let savefiles = fs.readdirSync(path.join(instancedirectory,"saves"));
for(i = 0; i < savefiles.length; i++){ for(i = 0; i < savefiles.length; i++){
if(savefiles[i].substr(savefiles[i].length - 8, 8) == ".tmp.zip") { if(savefiles[i].substr(savefiles[i].length - 8, 8) == ".tmp.zip") {
fs.unlinkSync(instancedirectory + "/saves/" + savefiles[i]); fs.unlinkSync(path.resolve(instancedirectory, "saves", savefiles[i]));
} }
} }
console.log("Deleting logs"); console.log("Deleting logs");
// clean old log file to avoid crash // clean old log file to avoid crash
// file exists, delete so we don't get in trouble // file exists, delete so we don't get in trouble
try { try {
fs.unlinkSync(instancedirectory+'/factorio-current.log'); fs.unlinkSync(path.join(instancedirectory,'factorio-current.log'));
} catch (err){ } catch (err){
if(err){ if(err){
console.log(err); console.log(err);
@@ -351,16 +351,16 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
} }
// move mods from ./sharedMods to the instances mod directory // move mods from ./sharedMods to the instances mod directory
try{fs.mkdirSync(instancedirectory + "/instanceMods/");}catch(e){} try{fs.mkdirSync(path.join(instancedirectory, "instanceMods"));}catch(e){}
try{rmdirSync(instancedirectory + "/mods");}catch(e){} try{rmdirSync(path.join(instancedirectory, "mods"));}catch(e){}
try { try {
// mods directory that will be emptied (deleted) when closing the server to facilitate seperation of instanceMods and sharedMods // mods directory that will be emptied (deleted) when closing the server to facilitate seperation of instanceMods and sharedMods
fs.mkdirSync(instancedirectory + "/mods/"); fs.mkdirSync(path.join(instancedirectory, "mods"));
} catch(e){} } catch(e){}
console.log("Clusterio | Moving shared mods from sharedMods/ to instance/mods..."); console.log("Clusterio | Moving shared mods from sharedMods/ to instance/mods...");
fs.copySync('sharedMods', instancedirectory + "/mods"); fs.copySync('sharedMods', path.join(instancedirectory, "mods"));
console.log("Clusterio | Moving instance specific mods from instance/instanceMods to instance/mods..."); console.log("Clusterio | Moving instance specific mods from instance/instanceMods to instance/mods...");
fs.copySync(instancedirectory + "/instanceMods", instancedirectory + "/mods"); fs.copySync(path.join(instancedirectory, "instanceMods"), path.join(instancedirectory, "mods"));
process.on('SIGINT', function () { process.on('SIGINT', function () {
console.log("Caught interrupt signal, sending /quit"); console.log("Caught interrupt signal, sending /quit");
@@ -371,7 +371,7 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
//var serverprocess = child_process.exec(commandline); //var serverprocess = child_process.exec(commandline);
fileOps.getNewestFile(instancedirectory + "/saves/", fs.readdirSync(instancedirectory + "/saves/"),function(err, latestSave) { fileOps.getNewestFile(instancedirectory + "/saves/", fs.readdirSync(instancedirectory + "/saves/"),function(err, latestSave) {
if(err) { if(err) {
console.error("ERROR!") console.error("ERROR!");
console.error("Your savefile seems to be missing. This might because you created an instance without having factorio\ console.error("Your savefile seems to be missing. This might because you created an instance without having factorio\
installed and configured properly. Try installing factorio and adding your savefile to instances/[instancename]/saves/\n"); installed and configured properly. Try installing factorio and adding your savefile to instances/[instancename]/saves/\n");
throw err; throw err;
+1 -1
View File
@@ -50,7 +50,7 @@
"moment": "^2.20.1", "moment": "^2.20.1",
"ncp": "^2.0.0", "ncp": "^2.0.0",
"nedb": "^1.8.0", "nedb": "^1.8.0",
"needle": "^1.1.0", "needle": "^2.2.1",
"node-factorio-api": "^0.3.1-alpha", "node-factorio-api": "^0.3.1-alpha",
"node-forge": "^0.7.1", "node-forge": "^0.7.1",
"prom-client": "^10.2.3", "prom-client": "^10.2.3",