kolibri version, version bump

worldpossible · Sep 13, 2018 · 8a39411 · 8a39411
1 parent 8d15f69
commit 8a39411
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/admin/version.php b/admin/version.php
@@ -398,6 +398,11 @@ function cancelTask(task_id, mybutton) {
     $rachel_installer_version = file_get_contents("/etc/rachelinstaller-version");
 }
 
+$kolibri_version = exec("export USER=`whoami`; kolibri --version;");
+if (!$kolibri_version || !preg_match("/^[\d\.]+$/", $kolibri_version)) {
+    $kolibri_version = "?";
+}
+
 $kalite_version = exec("export USER=`whoami`; kalite --version;");
 if (!$kalite_version || !preg_match("/^[\d\.]+$/", $kalite_version)) {
     $kalite_version = "?";
@@ -419,11 +424,12 @@ function cancelTask(task_id, mybutton) {
 <tr><td>Hardware</td><td><?php echo $hardware ?></td></tr>
 <tr><td>OS</td><td><?php echo $os ?></td></tr>
 <tr><td>RACHEL Installer</td><td><?php echo $rachel_installer_version ?></td></tr>
+<tr><td>Kolibri</td><td><?php echo $kolibri_version ?></tr>
 <tr><td>KA Lite</td><td><?php echo $kalite_version ?></tr>
 <tr><td>Kiwix</td><td><?php echo $kiwix_version ?></td></tr>
 <tr><td>Content Shell</td><td>
 
-    <span id="cur_contentshell">v2.3.8</span>
+    <span id="cur_contentshell">v2.3.9</span>
     <div style="float: right; margin-left: 20px;">
         <div style="float: left; width: 24px; height: 24px; margin-top: 2px;">
             <img src="../art/spinner.gif" id="spinner" style="display: none;">