Fix the backup and restore scripts to be more forgiving of user typos in command-line argument punctuation, and fix some spacing in backup script output as long as the version number is changing.

git-svn-id: http://svn.mythtv.org/svn/trunk@26864 7dbf422c-18fa-0310-86e9-fd20926502f2
(cherry picked from commit 7f42884)

Author: sphery

mythtv/programs/scripts/database/mythconverg_backup.pl

@@ -13,7 +13,7 @@
 
 # Script info
     $NAME           = 'MythTV Database Backup Script';
-    $VERSION        = '1.0.9';
+    $VERSION        = '1.0.10';
 
 # Some variables we'll use here
     our ($username, $homedir, $mythconfdir, $database_information_file);
@@ -83,10 +83,11 @@
                'compress=s'                         => \$compress,
                'rotate=i'                           => \$rotate,
                'rotateglob|glob=s'                  => \$rotateglob,
-               'backup_xmltvids|xmltvids'           => \$backup_xmltvids,
+               'backup_xmltvids|backup-xmltvids|'.
+               'xmltvids'                           => \$backup_xmltvids,
                'usage|help|h+'                      => \$usage,
                'version'                            => \$show_version,
-               'script_version|v'                   => \$show_version_script,
+               'script_version|script-version|v'    => \$show_version_script,
                'verbose|debug|d+'                   => \$debug
               );
 
@@ -861,9 +862,9 @@
             verbose($verbose_level_error,
                     '', 'ERROR: DBBackupDirectory is not a directory or is '.
                     'not writable. Please specify',
-                    '        a directory in your database information file'.
+                    '       a directory in your database information file'.
                     ' using DBBackupDirectory.',
-                    '        If not using a database information file,'.
+                    '       If not using a database information file,'.
                     ' please specify the ',
                     '        --directory command-line option.');
             die("\nInvalid backup directory, stopped");
@@ -1048,7 +1049,7 @@
             verbose($verbose_level_error,
                     '', 'ERROR: Unable to backup xmltvids without Perl'.
                     ' database libraries.',
-                    '        Please ensure the Perl DBI and DBD::mysql'.
+                    '       Please ensure the Perl DBI and DBD::mysql'.
                     ' modules are installed.');
             die("\nPerl database libraries missing, stopped");
         }

mythtv/programs/scripts/database/mythconverg_restore.pl

@@ -13,7 +13,7 @@
 
 # Script info
     $NAME           = 'MythTV Database Restore Script';
-    $VERSION        = '1.0.15';
+    $VERSION        = '1.0.16';
 
 # Some variables we'll use here
     our ($username, $homedir, $mythconfdir, $database_information_file);
@@ -67,19 +67,24 @@
                'schemaver|DBSchemaVer=s'            => \$db_schema_version,
                'directory|DBBackupDirectory=s'      => \$backup_directory,
                'filename|DBBackupFilename=s'        => \$backup_filename,
-               'partial_restore|new_hardware'       => \$partial_restore,
-               'with_plugin_data|plugin_data'       => \$with_plugin_data,
-               'restore_xmltvids|xmltvids'          => \$restore_xmltvids,
-               'mysql_client|client=s'              => \$mysql_client,
+               'partial_restore|new_hardware|'.
+               'partial-restore|new-hardware'       => \$partial_restore,
+               'with_plugin_data|plugin_data|'.
+               'with-plugin-data|plugin-data'       => \$with_plugin_data,
+               'restore_xmltvids|'.
+               'restore-xmltvids|xmltvids'          => \$restore_xmltvids,
+               'mysql_client|mysql-client|client=s' => \$mysql_client,
                'uncompress=s'                       => \$uncompress,
-               'drop_database|drop_db'              => \$drop_database,
-               'create_database|create_db|mc_sql'   => \$create_database,
-               'change_hostname'                    => \$change_hostname,
-               'new_hostname=s'                     => \$new_hostname,
-               'old_hostname=s'                     => \$old_hostname,
+               'drop_database|drop_db|'.
+               'drop-database|drop-db'              => \$drop_database,
+               'create_database|create_db|mc_sql|'.
+               'create-database|create-db|mc-sql'   => \$create_database,
+               'change_hostname|change-hostname'    => \$change_hostname,
+               'new_hostname|new-hostname=s'        => \$new_hostname,
+               'old_hostname|old-hostname=s'        => \$old_hostname,
                'usage|help|h+'                      => \$usage,
                'version'                            => \$show_version,
-               'script_version|v'                   => \$show_version_script,
+               'script_version|script-version|v'    => \$show_version_script,
                'verbose|debug|d+'                   => \$debug
               );