- Use clisetup.php where possible, remove redundant code

roundcube · Apr 20, 2011 · 6cc3f58 · 6cc3f58
1 parent 61517ce
commit 6cc3f58
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 22 deletions.
diff --git a/bin/cleandb.sh b/bin/cleandb.sh
@@ -20,12 +20,9 @@
 
 */
 
-if (php_sapi_name() != 'cli') {
-    die('Not on the "shell" (php-cli).');
-}
-
 define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
-require INSTALL_PATH.'program/include/iniset.php';
+
+require INSTALL_PATH.'program/include/clisetup.php';
 
 // mapping for table name => primary key
 $primary_keys = array(

diff --git a/bin/decrypt.sh b/bin/decrypt.sh
@@ -52,12 +52,9 @@
  *  - you are dealing with counterfeit header data.
  */
 
-if (php_sapi_name() != 'cli') {
-	die("Not on the 'shell' (php-cli).\n");
-}
-
 define('INSTALL_PATH', realpath(dirname(__FILE__).'/..') . '/');
-require INSTALL_PATH . 'program/include/iniset.php';
+
+require INSTALL_PATH . 'program/include/clisetup.php';
 
 if ($argc < 2) {
 	die("Usage: " . basename($argv[0]) . " encrypted-hdr-part [encrypted-hdr-part ...]\n");

diff --git a/bin/dumpschema.sh b/bin/dumpschema.sh
@@ -20,12 +20,9 @@
 
 */
 
-if (php_sapi_name() != 'cli') {
-    die('Not on the "shell" (php-cli).');
-}
-
 define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
-require INSTALL_PATH.'program/include/iniset.php';
+
+require INSTALL_PATH.'program/include/clisetup.php';
 
 /** callback function for schema dump **/
 function print_schema($dump)

diff --git a/bin/installto.sh b/bin/installto.sh
@@ -19,12 +19,9 @@
 
 */
 
-if (php_sapi_name() != 'cli') {
-    die('Not on the "shell" (php-cli).');
-}
 define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
 
-require_once INSTALL_PATH . 'program/include/iniset.php';
+require_once INSTALL_PATH . 'program/include/clisetup.php';
 
 $target_dir = unslashify($_SERVER['argv'][1]);
 

diff --git a/bin/update.sh b/bin/update.sh
@@ -19,9 +19,6 @@
 
 */
 
-if (php_sapi_name() != 'cli') {
-    die('Not on the "shell" (php-cli).');
-}
 define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
 
 require_once INSTALL_PATH . 'program/include/clisetup.php';