# HG changeset patch
# User Chris Cannam
# Date 1582815893 0
# Node ID b2e0b5d4cc5a5f582babeb2c2626b816ba831478
# Parent  5ac455fba0ed3b8184f9ee0bd979073f1fffd7ea
Avoid creating more than one backup dir

diff -r 5ac455fba0ed -r b2e0b5d4cc5a .hgignore
--- a/.hgignore	Thu Feb 27 14:28:03 2020 +0000
+++ b/.hgignore	Thu Feb 27 15:04:53 2020 +0000
@@ -46,7 +46,8 @@
 *.dmg
 *.app
 installer.qrc
-Dockerfile.gen
+Dockerfile*.gen
 plugins.zip
 get-version
 output.tar
+deploy/linux/docker/output
diff -r 5ac455fba0ed -r b2e0b5d4cc5a installer.cpp
--- a/installer.cpp	Thu Feb 27 14:28:03 2020 +0000
+++ b/installer.cpp	Thu Feb 27 15:04:53 2020 +0000
@@ -586,9 +586,17 @@
     QString source = ":out";
     QFile f(source + "/" + library);
     QString destination = targetDir + "/" + library;
-    QString backupDir = targetDir + "/" +
-        QString("saved-%1").arg(QDateTime::currentDateTime().toString
-                                 ("yyyyMMdd-hhmmss"));
+
+    static QString backupDirName;
+    if (backupDirName == "") {
+        // Static so as to be created once - don't go creating a
+        // second directory if the clock ticks over by one second
+        // between library installs
+        backupDirName = 
+            QString("saved-%1").arg(QDateTime::currentDateTime().toString
+                                    ("yyyyMMdd-hhmmss"));
+    }
+    QString backupDir = targetDir + "/" + backupDirName;
 
     if (!QDir(targetDir).exists()) {
         QDir().mkpath(targetDir);
@@ -969,6 +977,8 @@
         getUserApprovedPluginLibraries(info, target);
 
     if (toInstall.empty()) { // Cancelled, or nothing selected
+        SVCERR << "No libraries selected for installation, nothing to do"
+               << endl;
         return 0;
     }