diff --git a/app/index_development.html b/app/index_development.html deleted file mode 100644 index 4edb515..0000000 --- a/app/index_development.html +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - One Sky IT's Aether App (onsite) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Site-Nav-Menu
- -
- - - - - -
-
System-Notifications (and Site-Notifications)
- -
- -
- -
-
- - - -
- -
- - - -
System-Debug
- - - - - - - - - - - - - - diff --git a/app/index_onsite.html b/app/index_onsite.html index 082585b..e1d86c0 100644 --- a/app/index_onsite.html +++ b/app/index_onsite.html @@ -20,19 +20,19 @@ - - - - + + + + - - + + - - + + - - + + @@ -87,7 +87,7 @@ let page = {} page['page_for'] = { 'event': native_app_config.event_id, 'event_device': native_app_config.event_device_id, 'event_location': native_app_config.event_location_id, "event_session": native_app_config.event_session_id }; // Simple key value like object; - // page['current_url_root'] = 'http://lci.oneskyit.local:5000/'; + // page['current_url_root'] = 'http://lci.oneskyit.local/'; // page['current_url_full_path'] = '/event/pjrcghqwert/launcher/x7uFNCMEdOI?'; document.aether.page = page; @@ -111,7 +111,7 @@ - + diff --git a/app/js/aether_app_native_v4.js b/app/js/aether_app_native_v4.js index b410bcb..acd0159 100644 --- a/app/js/aether_app_native_v4.js +++ b/app/js/aether_app_native_v4.js @@ -729,6 +729,7 @@ exports.check_file_cache_and_open_local_file = async function ({local_file_cache // Kill processes +// Signals: HUP (hang up), INT (interrupt), QUIT (quit), ABRT (abort), KILL (non-catchable, non-ignoraable kill), ALRMn (alarm clock), TERM (default; software termination signal) // Updated 2022-05-07 exports.kill_processes = async function ({process_name = null, process_id = null, signal = null}) { console.log('*** Electron framework export: kill_processes() ***'); @@ -736,14 +737,34 @@ exports.kill_processes = async function ({process_name = null, process_id = null let cmd = ''; if (os.platform == 'darwin') { - if (signal == 'quit') { + if (signal == 'HUP') { + cmd = `killall -HUP '${process_name}'`; + } else if (signal == 'INT') { + cmd = `killall -INT '${process_name}'`; + } else if (signal == 'QUIT') { cmd = `killall -QUIT '${process_name}'`; - } else if (signal == 'kill') { - cmd = `killall -KILL '${process_name}'`; - } else if (process_id && signal == 'quit') { - cmd = `killall -QUIT ${process_id}`; - } else if (process_id && signal == 'kill') { - cmd = `killall -KILL ${process_id}`; + } else if (signal == 'ABRT') { + cmd = `killall -ABRT '${process_name}'`; + } else if (signal == 'KILL') { + cmd = `killall -KILL '${process_name}'`; + } else if (signal == 'ALRM') { + cmd = `killall -ALRM '${process_name}'`; + } else if (signal == 'TERM') { + cmd = `killall -TERM '${process_name}'`; + } else if (process_id && signal == 'HUP') { + cmd = `killall -HUP ${process_id}`; + } else if (process_id && signal == 'INT') { + cmd = `killall -INT ${process_id}`; + } else if (process_id && signal == 'QUIT') { + cmd = `killall -QUIT ${process_id}`; + } else if (process_id && signal == 'ABRT') { + cmd = `killall -ABRT ${process_id}`; + } else if (process_id && signal == 'KILL') { + cmd = `killall -KILL ${process_id}`; + } else if (process_id && signal == 'ALRM') { + cmd = `killall -ALRM ${process_id}`; + } else if (process_id && signal == 'TERM') { + cmd = `killall -TERM ${process_id}`; } else { // cmd = `osascript -e 'quit app "${process_name}" saving no'`; cmd = `osascript -e 'quit application "${process_name}" saving no'`; diff --git a/index.js b/index.js index fa5db40..bae63c3 100644 --- a/index.js +++ b/index.js @@ -84,10 +84,14 @@ function createWindow () { // and load the index.html of the app. if (config.native_app_js_css_option == '' || config.native_app_js_css_option == 'default') { win.loadFile('app/index.html'); - } else if (config.native_app_js_css_option == 'development') { - win.loadFile('app/index_development.html'); + } else if (config.native_app_js_css_option == 'development_internal') { + win.loadFile('app/index_development_internal.html'); + } else if (config.native_app_js_css_option == 'development_localhost') { + win.loadFile('app/index_development_localhost.html'); } else if (config.native_app_js_css_option == 'onsite') { win.loadFile('app/index_onsite.html'); + } else if (config.native_app_js_css_option == 'onsite_5000') { + win.loadFile('app/index_onsite.html'); } else { win.loadFile('app/index.html'); }