github-personal/labca
1
0
Fork 0
mirror of https://github.com/outbackdingo/labca.git synced 2026-01-27 10:19:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make update from gui more robust

Browse Source
This commit is contained in:
Arjan H
2022-04-14 20:43:13 +02:00
parent 6166f270b5
commit 69fc88c689
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commander
View File

@@ -218,9 +218,9 @@ case $txt in
cd $dn
branch="$(git symbolic-ref --short HEAD 2>/dev/null)" || branch="(none)"
if [ "$branch" == "master" ] || [ "$branch" == "main" ] || [ "$branch" == "(none)" ]; then
/home/labca/labca/install &>>$LOGFILE
nohup /home/labca/labca/install &>>$LOGFILE
else
/home/labca/labca/install -b $branch &>>$LOGFILE
nohup /home/labca/labca/install -b $branch &>>$LOGFILE
fi
;;
*)

9
gui/templates/views/manage.tmpl
View File

@@ -681,6 +681,15 @@
},
})
.done(function(data) {
if ( $(evt.target).attr("id") == "version-update") {
const date = Date.now();
let currentDate = null;
do {
currentDate = Date.now();
} while (currentDate - date < 60000);
window.location.reload();
}
$('#modal-spinner').modal('hide');
td = $(evt.target).parent().parent().find("td:eq(1)");