Xigmanas/xigmanas-bastille-extension
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Quick update to support bastille 0.9.x

Browse Source
This commit is contained in:
JRGTH
2021-07-15 11:38:31 -04:00
parent 5c82d2f4f6
commit 40ffe9cea4
5 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gui/bastille_manager_maintenance.php
View File

@@ -68,9 +68,6 @@ if (1 == mwexec("/bin/cat {$configfile} | /usr/bin/grep 'BACKUP_DIR='")) {
}
$backup_path = exec("/bin/cat {$configfile} | /usr/bin/grep 'BACKUP_DIR=' | cut -d'\"' -f2");
$prdname = "bastille";
$tarballversion = "/usr/local/bin/bastille";
if ($_POST) {
global $zfs_activated;
global $backup_path_bastille;
@@ -189,6 +186,7 @@ if ($_POST) {
$output = [];
exec($cmd,$output,$return_val);
if($return_val == 0):
unset ($errormsg);
ob_start();
include("{$logevent}");
$ausgabe = ob_get_contents();
@@ -254,19 +252,6 @@ if ($_POST) {
}
}
function get_version_bastille() {
global $tarballversion, $prdname;
if (is_file("{$tarballversion}")) {
//exec("/bin/cat {$tarballversion}", $result);
exec("/usr/bin/grep 'BASTILLE_VERSION=' {$tarballversion} | cut -d'\"' -f2", $result);
return ($result[0]);
}
else {
exec("/usr/local/bin/{$prdname} version | awk 'NR==1'", $result);
return ($result[0]);
}
}
function get_version_ext() {
global $versionfile;
exec("/bin/cat {$versionfile}", $result);