Updater and mvUtil modified to handle deletion of updater dependencies during uninstall on windows

Author: michaelrossherron

Updater/FEBioStudioUpdater.cpp

@@ -134,12 +134,12 @@ void uninstall()
 	get_app_path(updaterDir, 1023);
 	sprintf(updaterPath, "%sautoUpdate.xml", updaterDir);
 
+    QStringList files;
+    QStringList dirs;
+    QStringList cmds;
+
 	if(QFileInfo::exists(updaterPath))
 	{
-		QStringList files;
-		QStringList dirs;
-        QStringList cmds;
-
 		readXML(files, dirs, cmds);
 
 		files.append("autoUpdate.xml");
@@ -160,6 +160,27 @@ void uninstall()
             std::system(cmd.toStdString().c_str());
         }
 	}
+
+// Ugly fix for deleting updater dependencies on Windows
+#ifdef WIN32
+    QString command = QString("%1 -rm ").arg(QApplication::applicationDirPath() + MVUTIL);
+
+    int runMvUtil = false;
+    for(auto file : files)
+    {
+        if(QFileInfo::exists(file))
+        {
+            command = command + QString("\"%1\" ").arg(file);
+
+            runMvUtil = true;
+        }
+    }
+
+    if(runMvUtil)
+    {
+        std::system(command.toStdString().c_str());
+    }
+#endif
 }
 
 CMainWindow* getMainWindow()

Updater/MainWindow.cpp

@@ -38,23 +38,6 @@
 
 #include <iostream>
 
-#ifdef WIN32
-#define FEBIOBINARY "\\febio4.exe"
-#define FBSBINARY "\\FEBioStudio2.exe"
-#define FBSUPDATERBINARY "\\FEBioStudioUpdater.exe"
-#define MVUTIL "\\mvUtil.exe"
-#elif __APPLE__
-#define FEBIOBINARY "/febio4"
-#define FBSBINARY "/FEBioStudio"
-#define FBSUPDATERBINARY "/FEBioStudioUpdater"
-#define MVUTIL "/mvUtil"
-#else
-#define FEBIOBINARY "/febio4"
-#define FBSBINARY "/FEBioStudio"
-#define FBSUPDATERBINARY "/FEBioStudioUpdater"
-#define MVUTIL "/mvUtil"
-#endif
-
 namespace Ui
 {
 class MyWizardPage : public QWizardPage

Updater/MainWindow.h

@@ -2,6 +2,23 @@
 #include <QWizard>
 #include <QSslError>
 
+#ifdef WIN32
+#define FEBIOBINARY "\\febio4.exe"
+#define FBSBINARY "\\FEBioStudio2.exe"
+#define FBSUPDATERBINARY "\\FEBioStudioUpdater.exe"
+#define MVUTIL "\\mvUtil.exe"
+#elif __APPLE__
+#define FEBIOBINARY "/febio4"
+#define FBSBINARY "/FEBioStudio"
+#define FBSUPDATERBINARY "/FEBioStudioUpdater"
+#define MVUTIL "/mvUtil"
+#else
+#define FEBIOBINARY "/febio4"
+#define FBSBINARY "/FEBioStudio"
+#define FBSUPDATERBINARY "/FEBioStudioUpdater"
+#define MVUTIL "/mvUtil"
+#endif
+
 namespace Ui{
 class CMainWindow;
 }

Updater/mvUtil.cpp

@@ -12,6 +12,28 @@ int main(int argc, char* argv[])
 {
     if(argc < 3) return -1;
 
+// Ugly fix for deleting updater dependencies on Windows
+#ifdef WIN32
+    if(strcmp(argv[1], "-rm") == 0)
+    {
+        for (int index = 2; index < argc; index++)
+	    {
+            int n = 0;
+            while (std::remove(argv[index]) != 0)
+            {
+                // If the file just doesn't exist, break
+                if(errno == ENOENT) break;
+
+                _sleep(100);
+                n++;
+                if (n > 10) break;
+            }
+        }
+
+        return 0;
+    }
+#endif
+
     int start = 2;
     bool dev = false;