Merge remote-tracking branch 'origin/master' into database

[debbugs.git] / bin / debbugs-installsql

diff --git a/bin/debbugs-installsql b/bin/debbugs-installsql
index ede803cdab59870fb5355dc8c3458ae089e4fdcd..601c1761c682885b6a95224152507c58d3f4ac92 100755 (executable)
--- a/bin/debbugs-installsql
+++ b/bin/debbugs-installsql
@@ -88,7 +88,7 @@ GetOptions(\%options,
            'upgrade',
            'current_version|current-version',
            'developer_prepare|developer-prepare',
-           'overwrite_deployment|overwrite-deployment',
+           'overwrite_deployment|overwrite-deployment|force_overwrite|force-overwrite',
            'deployment_dir|deployment-dir=s',
           'debug|d+','help|h|?','man|m');
 
@@ -134,18 +134,15 @@ if ($options{current_version}) {
     print "The current database version is: ".$dh->database_version."\n";
     exit 0;
 } elsif ($options{install}) {
-    if ($options{developer_prepare}) {
-        $dh->prepare_install;
-        $dh->prepare_deploy;
-    } else {
-        $dh->install;
-    }
+    $dh->prepare_install if $options{developer_prepare};
+    $dh->install unless $options{developer_prepare};
 } elsif ($options{upgrade}) {
-    $dh->prepare_upgrade;
-    $dh->upgrade;
+    $dh->prepare_deploy if $options{developer_prepare};
+    $dh->prepare_upgrade() if $options{developer_prepare};
+    $dh->upgrade unless $options{developer_prepare};
 } elsif ($options{install_version_storage}) {
-    $dh->prepare_version_storage_install;
-    $dh->install_version_storage;
+    $dh->prepare_version_storage_install if $options{developer_prepare};
+    $dh->install_version_storage unless $options{developer_prepare};
 }