* install.cc (preremoveOne): Allow dash scripts and ".cmd" as an

	additional extension for Windows batch files.

diff --git a/ChangeLog b/ChangeLog
index 7db6c62816f0a079af103fbb8cbefc555ee068a9..77e68dd9d91eba7f131b6796affacf1c8b1f2c58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-07  Achim Gratz  <Stromeko@NexGo.DE>
+
+       * install.cc (preremoveOne): Allow dash scripts and ".cmd" as an
+       additional extension for WIndows batch files.
+
 2015-02-06  Corinna Vinschen  <corinna@vinschen.de>
 
        * package_meta.h (packagemeta::trustp): Make sure that curr and

diff --git a/install.cc b/install.cc
index 8b6037247027dca1048e1a384c76728c6e0b8279..216290240e020076014087b9f5d15510f83ce8d4 100644 (file)
--- a/install.cc
+++ b/install.cc
@@ -159,8 +159,10 @@ Installer::preremoveOne (packagemeta & pkg)
   Progress.SetText1 ("Running preremove script...");
   Progress.SetText2 (pkg.name.c_str());
   Log (LOG_PLAIN) << "Running preremove script for  " << pkg.name << endLog;
-  try_run_script ("/etc/preremove/", pkg.name, ".sh");
-  try_run_script ("/etc/preremove/", pkg.name, ".bat");
+  const unsigned numexts = 4;
+  const char* exts[numexts] = { ".dash", ".sh", ".bat", ".cmd" };
+  for (unsigned i = 0; i < numexts; i++)
+    try_run_script ("/etc/preremove/", pkg.name, exts[i]);
 }
 
 void