DataObjects/Images.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 68cc81f..3b3c98c 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -150,7 +150,7 @@ class Pman_Core_UpdateDatabase extends Pman
         $ff = HTML_FlexyFramework::get();
         
         if(!isset($ff->Pman) || !isset($ff->Pman['local_base_url'])){
-            die("Please setup local_base_url");
+            die("Please setup Pman[local_base_url]\n");
         }
         
         $this->local_base_url = $ff->Pman['local_base_url'];
@@ -912,7 +912,9 @@ class Pman_Core_UpdateDatabase extends Pman
         if ($done_check) {
             return;
         }
-        if (!empty($this->opts['skip-mysql-check'])) {
+        
+        
+        if (!empty($this->opts['skip-mysql-checks'])) {
             return;
         }
         // innodb in single files is far more efficient that MYD or one big innodb file.
@@ -921,7 +923,7 @@ class Pman_Core_UpdateDatabase extends Pman
         $db->query("show variables like 'innodb_file_per_table'");
         $db->fetch();
         if ($db->Value == 'OFF') {
-            die("Error: set innodb_file_per_table = 1 in my.cnf\n\n");
+            die("Error: set innodb_file_per_table = 1 in my.cnf (or run with --skip-mysql-checks\n\n");
         }
         
         $db = DB_DataObject::factory('core_enum');
@@ -1078,25 +1080,26 @@ class Pman_Core_UpdateDatabase extends Pman
     }
     
     
-    function checkSystem()
+    function checkSystem($req = false, $pref = false)
     {
         // most of these are from File_Convert...
         
         // these are required - and have simple dependancies.
         require_once 'System.php';
-        $req = array( 
+        $req = $req !== false ? $req : array( 
             'convert',
             'grep',
             'pdfinfo',
             'pdftoppm',
             'rsvg-convert',  //librsvg2-bin
             'strings',
+            'oathtool'
         );
          
          
          
         // these are prefered - but may have complicated depenacies
-        $pref= array(
+        $pref = $pref !== false ? $pref :  array(
             'abiword',
             'faad',
             'ffmpeg',