Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 10:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

improved updating process

Browse source 
we need to kill every freedata binary before closing or updating the tnc
This commit is contained in:
dj2ls 2022-05-01 09:44:30 +02:00
parent 69c3ccd86c
commit a2df7db3f9
3 changed files with 20 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
gui/main.js
View file

@ -592,38 +592,29 @@ function close_sub_processes(){
}
mainLog.warn('closing tnc');
mainLog.warn('closing tnc and daemon');
try {
if(os.platform()=='win32' || os.platform()=='win64'){
exec('Taskkill', ['/IM', 'freedata-tnc.exe', '/F'])
}
if(os.platform()=='linux'){
if(os.platform()=='win32' || os.platform()=='win64'){
exec('Taskkill', ['/IM', 'freedata-tnc.exe', '/F'])
exec('Taskkill', ['/IM', 'freedata-daemon.exe', '/F'])
}
exec('pkill', ['-9', 'freedata-tnc'])
// on macOS we need to kill the daemon as well. If we are not doing this,
// the daemon wont startup again because the socket is already in use
//for some reason killing the daemon is killing our screen on Ubuntu..it seems theres another "daemon" out there...
exec('pkill', ['-9', 'freedata-daemon'])
}
if(os.platform()=='linux'){
exec('pkill', ['-9', 'freedata-tnc'])
exec('pkill', ['-9', 'freedata-daemon'])
}
if(os.platform()=='darwin'){
if(os.platform()=='darwin'){
exec('pkill', ['-9', 'freedata-tnc'])
// on macOS we need to kill the daemon as well. If we are not doing this,
// the daemon wont startup again because the socket is already in use
//for some reason killing the daemon is killing our screen on Ubuntu..it seems theres another "daemon" out there...
exec('pkill', ['-9', 'freedata-daemon'])
exec('pkill', ['-9', 'freedata-tnc'])
exec('pkill', ['-9', 'freedata-daemon'])
}
} catch (e) {
mainLog.error(e)
}
/*
if (process.platform !== 'darwin') {
app.quit();
}
*/
};

2
gui/package.json
View file

@ -1,6 +1,6 @@
{
"name": "FreeDATA",
"version": "0.4.0-alpha.2",
"version": "0.4.0-alpha.3",
"description": "FreeDATA ",
"main": "main.js",
"scripts": {

6
gui/preload-main.js
View file

@ -1906,22 +1906,18 @@ ipcRenderer.on('action-updater', (event, arg) => {
}
if (arg.status == "update-not-available"){
//bootstrap.Toast.getOrCreateInstance(document.getElementById('toastUpdateChecking')).hide();
document.getElementById("updater_status").innerHTML = '<i class="bi bi-check2-square ms-1 me-1" style="color: white;"></i>';
document.getElementById("updater_status").className = "btn btn-success btn-sm";
document.getElementById("update_and_install").style.display = 'none';
}
if (arg.status == "update-available"){
//bootstrap.Toast.getOrCreateInstance(document.getElementById('toastUpdateChecking')).hide();
document.getElementById("updater_status").innerHTML = "update available...";
document.getElementById("updater_status").innerHTML = '<i class="bi bi-hourglass-split ms-1 me-1" style="color: white;"></i>';
document.getElementById("updater_status").className = "btn btn-warning btn-sm";
document.getElementById("update_and_install").style.display = 'none';
}
if (arg.status == "error"){