Remove *.upgrade files in weechat dir after /upgrade

3 files changed, 35 insertions, 0 deletions

diff --git a/src/core/wee-upgrade.c b/src/core/wee-upgrade.c
index a99351e1a..849aa927e 100644
--- a/src/core/wee-upgrade.c
+++ b/src/core/wee-upgrade.c
@@ -24,12 +24,14 @@
 #endif
 
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 
 #include "weechat.h"
 #include "wee-upgrade.h"
 #include "wee-infolist.h"
 #include "wee-string.h"
+#include "wee-util.h"
 #include "../gui/gui-buffer.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-history.h"
@@ -562,3 +564,33 @@ upgrade_weechat_load ()
     
     return rc;
 }
+
+/*
+ * upgrade_weechat_remove_file_cb: callback called to remove a .upgrade file
+ */
+
+void
+upgrade_weechat_remove_file_cb (void *data, const char *filename)
+{
+    /* make C compiler happy */
+    (void) data;
+    
+    if (string_match (filename, "*.upgrade", 1))
+    {
+        if (weechat_debug_core >= 2)
+            gui_chat_printf (NULL, _("debug: removing file: %s"), filename);
+        unlink (filename);
+    }
+}
+
+/*
+ * upgrade_weechat_remove_files: remove *.upgrade files after upgrade
+ */
+
+void
+upgrade_weechat_remove_files ()
+{
+    util_exec_on_files (weechat_home,
+                        NULL,
+                        &upgrade_weechat_remove_file_cb);
+}
diff --git a/src/core/wee-upgrade.h b/src/core/wee-upgrade.h
index 500a7eae4..856ccec99 100644
--- a/src/core/wee-upgrade.h
+++ b/src/core/wee-upgrade.h
@@ -38,5 +38,6 @@ enum t_upgrade_weechat_type
 
 int upgrade_weechat_save ();
 int upgrade_weechat_load ();
+void upgrade_weechat_remove_files ();
 
 #endif /* wee-upgrade.h */
diff --git a/src/core/weechat.c b/src/core/weechat.c
index d32e0c53e..ac11bbc16 100644
--- a/src/core/weechat.c
+++ b/src/core/weechat.c
@@ -410,6 +410,8 @@ main (int argc, char *argv[])
                  argc, argv); 
     command_startup (1);                /* command executed after plugins   */
     gui_layout_window_apply (gui_layout_windows, -1); /* apply saved layout */
+    if (weechat_upgrading)
+        upgrade_weechat_remove_files ();/* remove .upgrade files            */
     weechat_upgrading = 0;
     
     gui_main_loop ();                   /* WeeChat main loop                */