iservchk: Test does not allow output, better use Shell; more exit codes in update...

[iserv-mod-error-reporter.git] / iservchk / 20base

diff --git a/iservchk/20base b/iservchk/20base
index cfe9937..1f59f88 100644 (file)
--- a/iservchk/20base
+++ b/iservchk/20base
@@ -1,8 +1,11 @@
-Test 'import configuration from IServ 1' 
-  '[ ! -f /old/opt/iserv/idesk/inc/error-reporter/config.inc.rpmsave ]'
-  /usr/share/iserv/modules/error-reporter/update-config-from-iserv1.sh
-Test 'update old config'
-  '[ ! -f /usr/share/iserv/www/inc/mod_error-reporter/config.inc ]'
-  /usr/share/iserv/modules/error-reporter/update-config
-Shell 'update database' /usr/share/iserv/modules/error-reporter/update-database
+Shell 'import configuration from IServ 1' 
+  if [ -f /old/opt/iserv/idesk/inc/error-reporter/config.inc.rpmsave ]; then
+    /usr/share/iserv/modules/error-reporter/update-config-from-iserv1.sh
+  fi;
+Shell 'update old config'
+  if [ -f /usr/share/iserv/www/inc/mod_error-reporter/config.inc ]; then
+    /usr/share/iserv/modules/error-reporter/update-config.sh
+  fi;
+Shell 'update database'
+  /usr/share/iserv/modules/error-reporter/update-database.php