fix help modes

Author: Doug Bird

bin/clientcal-user.php

@@ -27,10 +27,10 @@ public static function showUsage() {
       }
 
       public static function showHelp() {
-         echo self::HELP_LABEL."\n";
+         echo self::HELP_LABEL.PHP_EOL;
          $fallbackAppDir = self::DEFAULT_APP_DIR;
          $me = self::ME;
-         echo <<<"EOT"
+         $help=<<<"HELP"
 Options:
 --help
    Output a help message and exit.
@@ -55,8 +55,8 @@ public static function showHelp() {
 
 <PASSWORD>
    Specifies the user's password; avoid being prompted for password.
-EOT;
-         echo \PHP_EOL;
+HELP;
+         echo str_replace("\n",\PHP_EOL,$help).\PHP_EOL;
       }
 
       /**

bin/db-export.php

@@ -35,12 +35,9 @@ public static function showUsage() {
       }
 
       public static function showHelp() {
-         echo self::HELP_LABEL."\n";
-         $fallbackDbname = self::FALLBACK_DBNAME;
-         $fallbackHost = self::FALLBACK_HOST;
-         $fallbackUsername = self::FALLBACK_USERNAME;
+         echo self::HELP_LABEL.PHP_EOL;
          $me = self::ME;
-         echo <<<"EOT"
+         $help=<<<"HELP"
 Output Control:
 --help
    Enable "help mode": outputs this message then exits.
@@ -70,7 +67,8 @@ public static function showHelp() {
 App Configuration:
 --app-dir=<path to project app directory> (optional)
    The directory where this script will look for the "bin-common.php" file and "data/mysql" sub-directory.
-EOT;
+HELP;
+         echo str_replace("\n",\PHP_EOL,$help).\PHP_EOL;
       }
 
       /**

bin/db-install.php

@@ -39,11 +39,11 @@ public static function showUsage() {
    }
 
    public static function showHelp() {
-      echo self::HELP_LABEL."\n";
+      echo self::HELP_LABEL.PHP_EOL;
       $fallbackDbname = self::FALLBACK_DBNAME;
       $fallbackHost = self::FALLBACK_HOST;
       $fallbackUsername = self::FALLBACK_USERNAME;
-      echo <<<"EOT"
+      $help=<<<"EOT"
 Output Control:
 --help
    Enable "help mode": outputs this message then exits.
@@ -83,6 +83,7 @@ public static function showHelp() {
    PDO Data Source Name string
    See: http://php.net/manual/en/pdo.construct.php
 EOT;
+      echo str_replace("\n",\PHP_EOL,$help).\PHP_EOL;
    }
 
    /**