Fix bastille version display under maintenance tab

This commit is contained in:
JRGTH
2025-09-04 14:15:46 -04:00
parent 985d5adf39
commit 74428e54e1
3 changed files with 7 additions and 3 deletions
+1
View File
@@ -3,6 +3,7 @@
====================== ======================
Version Description Version Description
1.1.44......Fix bastille version display under maintenance tab.
1.1.43......Update: Finish adding support for 14.3 release. 1.1.43......Update: Finish adding support for 14.3 release.
1.1.42......Update: Add support for 14.3 release + add -a option for destroy. 1.1.42......Update: Add support for 14.3 release + add -a option for destroy.
1.1.41......Update: Add support for 14.2 release. 1.1.41......Update: Add support for 14.2 release.
Executable → Regular
+5 -2
View File
@@ -90,8 +90,11 @@ function is_dir_empty($reldir) {
function get_version_bastille() { function get_version_bastille() {
global $tarballversion, $prdname; global $tarballversion, $prdname;
if (is_file("{$tarballversion}")) { if (is_file("{$tarballversion}")) {
//exec("/bin/cat {$tarballversion}", $result); // For some reason bastille bin version value isn't double quoted anymore so we can't use the old delimiter.
exec("/usr/bin/grep 'BASTILLE_VERSION=' {$tarballversion} | cut -d'\"' -f2", $result); // we will keep the old line for reference.
//exec("/usr/bin/grep 'BASTILLE_VERSION=' {$tarballversion} | cut -d'\"' -f2", $result);
exec("/usr/bin/grep 'BASTILLE_VERSION=' {$tarballversion} | cut -d'=' -f2", $result);
return ($result[0] ?? ''); return ($result[0] ?? '');
} }
else { else {
+1 -1
View File
@@ -1 +1 @@
1.1.43 1.1.44