diff netinstall/uninstall.cc @ 666:146d342ff859

[xemacs-hg @ 2001-09-25 02:35:32 by andyp] more updates
author andyp
date Tue, 25 Sep 2001 02:35:32 +0000
parents ce0b3f2eff35
children a307f9a2021d
line wrap: on
line diff
--- a/netinstall/uninstall.cc	Thu Sep 20 06:31:11 2001 +0000
+++ b/netinstall/uninstall.cc	Tue Sep 25 02:35:32 2001 +0000
@@ -68,6 +68,7 @@
 extern char * map_filename (char *fn, int type);
 void remove_desktop_setup ();
 static void start_uninstall ();
+extern char* find_xemacs_exe_name();
 
 char *
 base (char *s);
@@ -281,7 +282,10 @@
       if (pkg != 0)
 	if (strncmp ("xemacs-i686", pkg, 11) == 0
 	    || (strncmp ("xemacs-i586", pkg, 11) == 0))
-	  np->type = install_type;
+	  {
+	    np->type = install_type;
+	    xemacs_package = np;
+	  }
     }
   fclose (db);
 }
@@ -306,13 +310,10 @@
 
   PostMessage (unins_dialog, XM_DONE, 0, 0);
 
-  remove_desktop_setup();
-  char *odbn = concat (root_dir, XEMACS_SETUP_DIR, "installed.db", 0);
-  char *sdbn = concat (root_dir, XEMACS_SETUP_DIR, "installed.db.old", 0);
+  remove (concat (root_dir, XEMACS_SETUP_DIR, "installed.db.old", 0));
+  remove (concat (root_dir, XEMACS_SETUP_DIR, "installed.db", 0));
 
-  remove (sdbn);
-  remove (odbn);
-
+  remove_desktop_setup();
   remove_xemacs_root();
   remove_uninstall_path();