Fix typo in tarballs and cleanup, thanks to Lux

This commit is contained in:
JRGTH
2025-10-21 10:05:03 -04:00
parent 7e325df51b
commit 05e89da69d
6 changed files with 15 additions and 14 deletions

View File

@@ -3,6 +3,7 @@
====================== ======================
Version Description Version Description
1.2.19......Fix typo in tarballs page and cleanup, thanks to Lux.
1.2.18......Fix typo in tarballs download page, thanks to Lux. 1.2.18......Fix typo in tarballs download page, thanks to Lux.
1.2.17......Check if bastille_zfs_enable is actually set to NO before zfs disable. 1.2.17......Check if bastille_zfs_enable is actually set to NO before zfs disable.
1.2.16......Disable zfs activation warnings if bastille_zfs_enable is set to NO. 1.2.16......Disable zfs activation warnings if bastille_zfs_enable is set to NO.

View File

@@ -319,12 +319,12 @@ $(document).ready(function(){
<form action="bastille_manager_maintenance.php" method="post" name="iform" id="iform" onsubmit="spinner()"> <form action="bastille_manager_maintenance.php" method="post" name="iform" id="iform" onsubmit="spinner()">
<table width="100%" border="0" cellpadding="0" cellspacing="0"> <table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td class="tabnavtbl"> <tr><td class="tabnavtbl">
<ul id="tabnav"> <ul id="tabnav">
<li class="tabinact"><a href="bastille_manager_gui.php"><span><?=gettext("Containers");?></span></a></li> <li class="tabinact"><a href="bastille_manager_gui.php"><span><?=gettext("Containers");?></span></a></li>
<li class="tabact"><a href="bastille_manager_info.php"><span><?=gettext("Information");?></span></a></li> <li class="tabact"><a href="bastille_manager_info.php"><span><?=gettext("Information");?></span></a></li>
<li class="tabact"><a href="bastille_manager_maintenance.php"><span><?=gettext("Maintenance");?></span></a></li> <li class="tabact"><a href="bastille_manager_maintenance.php"><span><?=gettext("Maintenance");?></span></a></li>
</ul> </ul>
</td></tr> </td></tr>
<tr><td class="tabnavtbl"> <tr><td class="tabnavtbl">
<ul id="tabnav2"> <ul id="tabnav2">
<li class="tabact"><a href="bastille_manager_config.php"><span><?=gettext("Bastille Configuration");?></span></a></li> <li class="tabact"><a href="bastille_manager_config.php"><span><?=gettext("Bastille Configuration");?></span></a></li>

View File

@@ -53,7 +53,7 @@ function get_rel_list() {
if (is_dir("{$rootfolder}/releases")): if (is_dir("{$rootfolder}/releases")):
$entries = preg_grep('/^[0-9]+\.[0-9]+\-RELEASE|(Debian[0-9]{1,2}$)|(Ubuntu_[0-9]{4}$)/', scandir("{$rootfolder}/releases")); $entries = preg_grep('/^[0-9]+\.[0-9]+\-RELEASE|(Debian[0-9]{1,2}$)|(Ubuntu_[0-9]{4}$)/', scandir("{$rootfolder}/releases"));
foreach($entries as $entry): foreach($entries as $entry):
$a = preg_split('/\t/',$entry); $a = preg_split('/\t/',$entry);
$r = []; $r = [];
$name = $a[0]; $name = $a[0];
if(preg_match('/^[0-9]+\.[0-9]+\-RELEASE|(Debian[0-9]{1,2}$)|(Ubuntu_[0-9]{4}$)/', $name, $m)): if(preg_match('/^[0-9]+\.[0-9]+\-RELEASE|(Debian[0-9]{1,2}$)|(Ubuntu_[0-9]{4}$)/', $name, $m)):
@@ -101,7 +101,7 @@ else:
'14.2-RELEASE' => gettext('14.2-RELEASE'), '14.2-RELEASE' => gettext('14.2-RELEASE'),
'14.1-RELEASE' => gettext('14.1-RELEASE'), '14.1-RELEASE' => gettext('14.1-RELEASE'),
'14.0-RELEASE' => gettext('14.0-RELEASE'), '14.0-RELEASE' => gettext('14.0-RELEASE'),
'13.5-RELEASE' => gettext('13.4-RELEASE'), '13.5-RELEASE' => gettext('13.5-RELEASE'),
'13.4-RELEASE' => gettext('13.4-RELEASE'), '13.4-RELEASE' => gettext('13.4-RELEASE'),
]; ];
endif; endif;
@@ -275,7 +275,7 @@ $document->render();
<?php <?php
if (is_dir($reldir)): if (is_dir($reldir)):
if (!is_dir_empty($reldir)): if (!is_dir_empty($reldir)):
html_titleline2(gettext('FreeBSD/Linux Base Release Installed')); html_titleline2(gettext('FreeBSD/Linux Base Release Installed'));
endif; endif;
foreach ($sphere_array as $sphere_record): foreach ($sphere_array as $sphere_record):
if (file_exists("{$reldir}/{$sphere_record['relname']}/root/.profile")): if (file_exists("{$reldir}/{$sphere_record['relname']}/root/.profile")):

View File

@@ -1 +1 @@
1.2.18 1.2.19