Changeset 1498 for trunk/gsinstaller/gsinstall.cpp

Timestamp:

2000-09-05T03:30:48+12:00 (24 years ago)

Author:

cs025

Message:

Further changes for uninstaller

File:

• trunk/gsinstaller/gsinstall.cpp (modified) (5 diffs)

trunk/gsinstaller/gsinstall.cpp

@@ -67 +67 @@
     bool                installNetscape();
     void                setDestination();
-    void                setUninstall();
+    bool                setUninstall();
     void                uninstall();
     void                setManifest();
@@ -320 +320 @@
 }
 
-void GSInstall::setUninstall()
-{
-  // open the log for reading
-  FilePath *logPath = new FilePath(this->collectPath->pathString(), "install.log");
+bool GSInstall::setUninstall()
+{ char tempPathStr[MAX_PATH];
+
+  // if we failed to get the Windows temporary directory, abort
+  if (GetTempPath(MAX_PATH, tempPathStr) == 0)
+  { // TODO: abort!
+    return false;
+  }
+
+  FilePath tempPath(tempPathStr);
+
+  // if we are not running in the Windows temporary directory, copy this exe
+  // and the installation log to the temporary directory and run them there
+  if (*this->sourcePath != tempPath)
+  { // copy this and install.log to temporary directory and restart
+    FilePath exePath(*this->sourcePath, "gssetup.exe");
+    FilePath logPath(*this->sourcePath, "install.log");
+
+    FilePath exeDest(tempPath, "gssetup.exe");
+    FilePath logDest(tempPath, "install.log");
+
+    CopyFile(exePath.cString(), exeDest.cString(), false);
+    CopyFile(logPath.cString(), logDest.cString(), false);
+
+    // now run the gssetup in the temporary directory
+    launchApp launchUninstall(exeDest);
+    launchUninstall.setCommandLine(" -u " + logPath.pathString());
+    launchUninstall.run(false, 0, "", "", false);
+
+    return false;
+  }
+
+  // open the log for reading from the directory this exe is now in (which
+  // will in fact be the temporary directory as outlined above)
+  FilePath *logPath = new FilePath(this->sourcePath->pathString(), "install.log");
   this->openLog(logPath->pathString(), false);
   delete logPath;
+
+  return true;
 }
 
@@ -338 +371 @@
     gsProfile gsdlProfile(*this, iniPath->pathString());
 
-    while ((command = this->readCommand(params)) != "")
+    while ((command = this->popCommand(params)) != "")
   { if (!this->manifest->undoAction(command, params))
     { if (!gsdlProfile.undoAction(command, params))
@@ -752 +785 @@
     case WM_USER:
     { // uninstall action
-        if (strstr(app_cmdLine, "-u") != NULL || true)
-        { char *at = strstr(app_cmdLine, "-u");
-        at += strlen("-u") + 1;
+        if (strstr(app_cmdLine, "-u") != NULL)
+        { // skip past the -u option itself
+        char *at = strstr(app_cmdLine, "-u");
+        at += strlen("-u");
+
+        // extract the log file path from the command line
+        while (*at == ' ')
+        { at ++;
+        }
+        string logPathString(at);
+        FilePath logPath(logPathString);
 
                 GSInstall install(true);
-        install.setUninstall();
-        install.uninstall();
+        // if we're running in the temporary directory, do the uninstall
+        if (install.setUninstall())
+        {   install.uninstall();
+
+            // close the log to write back all changes to the log; if the file
+          // will be deleted, it must be closed; copying may also fail, so it's
+          // safer to close it before doing either.
+            install.closeLog();
+
+          // if the install is empty, terminate all final items (currently the
+          // log and setup executables,
+          if (install.isEmpty())
+          { // delete the log file
+            DeleteFile(logPath.cString());
+
+            // get it's parent to find where the gssetup executable will be
+            FilePath *logParent = logPath.parent();
+                        FilePath uninstallPath(*logParent, "gssetup.exe");
+
+            // delete the gssetup executable
+            DeleteFile(uninstallPath.cString());
+
+            // dispose of the parent directory information
+            delete logParent;
+          }
+          // if not, then overwrite the original log with the modified one
+          else
+          { // do nothing - should be changed already!
+          }
+        }
       }
       // install wizard
@@ -777 +846 @@
               install.updateRegistry();
             install.updateProfiles();
+
+          // the log will need reopening (probably failed initially)
+                  install.reopenLog();
+
+          // close log
+          install.closeLog();
 
             // do further actions