Scott.Idem/OSIT-AE-App-Native-Electron
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated config file name

Browse Source
This commit is contained in:
Scott Idem
2022-10-26 17:34:26 -04:00
parent a54d2c08bc
commit 14cc3d1c3e
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/js/aether_app_native_v4.js
View File

@@ -63,8 +63,8 @@ exports.load_config = function () {
// let config = null; // let config = null;
let config_directory = null; let config_directory = null;
// let default_config_path = path.join(process.cwd(),'config.json.default'); // let default_config_path = path.join(process.cwd(),'aether_native_app_config.current.json');
let default_config_path = 'config.json.default'; let default_config_path = 'aether_native_app_config.current.json';
console.log(default_config_path); console.log(default_config_path);
let config_path = null; let config_path = null;
@@ -84,13 +84,13 @@ exports.load_config = function () {
fs.mkdirSync(config_directory); fs.mkdirSync(config_directory);
console.log('Config directory created: '+config_directory); console.log('Config directory created: '+config_directory);
//default_config_path = path.join(process.cwd(),'config.json.default'); //default_config_path = path.join(process.cwd(),'aether_native_app_config.current.json');
// config_path = path.join(config_directory, 'config.json'); // config_path = path.join(config_directory, 'aether_native_app_config.json');
// fs.copyFileSync(default_config_path, config_path); // fs.copyFileSync(default_config_path, config_path);
// console.log('Default config file copied: '+config_directory); // console.log('Default config file copied: '+config_directory);
} }
config_path = path.join(config_directory, 'config.json'); config_path = path.join(config_directory, 'aether_native_app_config.json');
// Attempt to open the config file. The preferred location is based on the OS's config directory. // Attempt to open the config file. The preferred location is based on the OS's config directory.
if (fs.existsSync(config_path)) { if (fs.existsSync(config_path)) {
@@ -101,21 +101,21 @@ exports.load_config = function () {
// config = JSON.parse(fs.readFileSync(config_path)); // config = JSON.parse(fs.readFileSync(config_path));
// console.log('Config file read.'); // console.log('Config file read.');
} else if (fs.existsSync(path.join(cwd, 'config.json'))) { } else if (fs.existsSync(path.join(cwd, 'aether_native_app_config.json'))) {
//fs.copyFileSync(default_config_path, config_path); //fs.copyFileSync(default_config_path, config_path);
//console.log('Default config file copied: '+config_directory); //console.log('Default config file copied: '+config_directory);
console.log(`Config file (config.json) not found under ${config_directory}. Using config in CWD. ${cwd}`); console.log(`Config file (config.json) not found under ${config_directory}. Using config in CWD. ${cwd}`);
config_path = path.join(cwd, 'config.json'); config_path = path.join(cwd, 'aether_native_app_config.json');
console.log(`Config file (config.json) not found under ${config_directory}. Using config in CWD. ${cwd}`); console.log(`Config file (config.json) not found under ${config_directory}. Using config in CWD. ${cwd}`);
let found_config_path = path.join(cwd, 'config.json'); let found_config_path = path.join(cwd, 'aether_native_app_config.json');
fs.copyFileSync(found_config_path, config_path); fs.copyFileSync(found_config_path, config_path);
console.log(`Found config file copied: ${config_directory}`); console.log(`Found config file copied: ${config_directory}`);
} else if (fs.existsSync(path.join(cwd, 'config.json.default'))) { } else if (fs.existsSync(path.join(cwd, 'aether_native_app_config.current.json'))) {
console.log(`Config file (config.json) not found under ${config_directory} or CWD. Using default config in CWD. ${cwd}`); console.log(`Config file (config.json) not found under ${config_directory} or CWD. Using default config in CWD. ${cwd}`);
default_config_path = path.join(cwd, 'config.json.default'); default_config_path = path.join(cwd, 'aether_native_app_config.current.json');
fs.copyFileSync(default_config_path, config_path); fs.copyFileSync(default_config_path, config_path);
console.log(`Default config file copied: ${config_directory}`); console.log(`Default config file copied: ${config_directory}`);

5
index.js
View File

@@ -29,8 +29,9 @@ if (os.platform == 'darwin') {
console.log('Linux config directory: '+config_directory); console.log('Linux config directory: '+config_directory);
} }
let config_path = path.join(config_directory, 'config.json'); // let config_path = path.join(config_directory, 'config.json');
// let config = null; let config_path = path.join(config_directory, 'aether_native_app_config.json');
let config = JSON.parse(fs.readFileSync(config_path)); let config = JSON.parse(fs.readFileSync(config_path));
console.log('Config file read.', config); console.log('Config file read.', config);