From 74428e54e19c02abbdcf59759d8bfc050d853381 Mon Sep 17 00:00:00 2001 From: JRGTH Date: Thu, 4 Sep 2025 14:15:46 -0400 Subject: [PATCH] Fix bastille version display under maintenance tab --- CHANGELOG | 1 + gui/bastille_manager-lib.inc | 7 +++++-- version | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) mode change 100755 => 100644 gui/bastille_manager-lib.inc diff --git a/CHANGELOG b/CHANGELOG index c063003..55c7620 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== 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.42......Update: Add support for 14.3 release + add -a option for destroy. 1.1.41......Update: Add support for 14.2 release. diff --git a/gui/bastille_manager-lib.inc b/gui/bastille_manager-lib.inc old mode 100755 new mode 100644 index d6cf529..cdd0f26 --- a/gui/bastille_manager-lib.inc +++ b/gui/bastille_manager-lib.inc @@ -90,8 +90,11 @@ function is_dir_empty($reldir) { 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); + // For some reason bastille bin version value isn't double quoted anymore so we can't use the old delimiter. + // 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] ?? ''); } else { diff --git a/version b/version index 2c69d9f..633becb 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1.43 +1.1.44