From 712a89c442323a9ecbb62333426c16f7ef0562cb Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Sat, 2 Jul 2016 17:10:42 +0200
Subject: [PATCH] cesetup, updated for dastworx

---
 cesetup/cesetup.d             | 27 ++++++++++++++++++++++++---
 cesetup/cp-rpm-files-nux64.sh |  3 +--
 cesetup/zip-nux32.sh          |  2 +-
 cesetup/zip-nux64.sh          |  2 +-
 cesetup/zip-win32.bat         |  2 +-
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/cesetup/cesetup.d b/cesetup/cesetup.d
index 72471e3c..64bd0bcd 100644
--- a/cesetup/cesetup.d
+++ b/cesetup/cesetup.d
@@ -30,8 +30,7 @@ struct Resource
 Resource[] ceResources =
 [
     Resource(cast(ImpType) import("coedit" ~ exeExt), "coedit" ~ exeExt, Kind.exe),
-    Resource(cast(ImpType) import("cesyms" ~ exeExt), "cesyms" ~ exeExt, Kind.exe),
-    Resource(cast(ImpType) import("cetodo" ~ exeExt), "cetodo" ~ exeExt, Kind.exe),
+    Resource(cast(ImpType) import("dastworx" ~ exeExt), "dastworx" ~ exeExt, Kind.exe),
     Resource(cast(ImpType) import("coedit.ico"), "coedit.ico", Kind.dat),
     Resource(cast(ImpType) import("coedit.png"), "coedit.png", Kind.dat),
     Resource(cast(ImpType) import("coedit.license.txt"), "coedit.license.txt", Kind.doc)
@@ -44,6 +43,11 @@ Resource[] dcdResources =
     Resource(cast(ImpType) import("dcd.license.txt"), "dcd.license.txt", Kind.doc)
 ];
 
+Resource[] oldResources =
+[
+    Resource(cast(ImpType) [], "cesyms" ~ exeExt, Kind.exe),
+    Resource(cast(ImpType) [], "cetodo" ~ exeExt, Kind.exe),
+];
 
 static struct Formater
 {
@@ -179,13 +183,22 @@ void main(string[] args)
     bool done;
     if(!uninstall)
     {
-        static immutable extractMsg = [": FAILURE", ": extracted"];
+        enum extractMsg = [": FAILURE", ": extracted"];
+        enum oldMsg = [": FAILURE", ": removed old file"];
         foreach(res; ceResources)
         {
             done = installResource(res);
             Formater.justify!'L'(res.destName ~ extractMsg[done]);
             failures += !done;
         }
+        foreach(res; oldResources)
+        {
+            if (!res.targetFilename.exists)
+                continue;
+            done = uninstallResource(res);
+            Formater.justify!'L'(res.destName ~ oldMsg[done]);
+            failures += !done;
+        }
         if (!nodcd) foreach(res; dcdResources)
         {
             done = installResource(res);
@@ -235,6 +248,14 @@ void main(string[] args)
             Formater.justify!'L'(res.destName ~ rmMsg[done]);
             failures += !done;
         }
+        foreach(res; oldResources)
+        {
+            if (!res.targetFilename.exists)
+                continue;
+            done = uninstallResource(res);
+            Formater.justify!'L'(res.destName ~ rmMsg[done]);
+            failures += !done;
+        }
         // remove $PF folder
         version(Windows)
         {
diff --git a/cesetup/cp-rpm-files-nux64.sh b/cesetup/cp-rpm-files-nux64.sh
index 3f884b5b..9f95ce78 100644
--- a/cesetup/cp-rpm-files-nux64.sh
+++ b/cesetup/cp-rpm-files-nux64.sh
@@ -9,8 +9,7 @@ mkdir -p $pixdir
 mkdir -p $shcdir
 
 cp nux64/coedit $bindir
-cp nux64/cesyms $bindir
-cp nux64/cetodo $bindir
+cp nux64/dastworx $bindir
 cp nux64/coedit.png $pixdir
 
 echo "[Desktop Entry]
diff --git a/cesetup/zip-nux32.sh b/cesetup/zip-nux32.sh
index 8df8ec87..59fb736f 100644
--- a/cesetup/zip-nux32.sh
+++ b/cesetup/zip-nux32.sh
@@ -6,7 +6,7 @@ cp * $fld/
 zip -9 \
 ../output/coedit.$ver.linux32.zip \
 $fld/dcd.license.txt $fld/coedit.license.txt \
-$fld/coedit $fld/cetodo $fld/cesyms \
+$fld/coedit $fld/dastworx \
 $fld/coedit.ico $fld/coedit.png \
 $fld/dcd-server $fld/dcd-client
 rm -rf coedit-x86
diff --git a/cesetup/zip-nux64.sh b/cesetup/zip-nux64.sh
index d83f262f..0aec31d7 100644
--- a/cesetup/zip-nux64.sh
+++ b/cesetup/zip-nux64.sh
@@ -6,7 +6,7 @@ cp * $fld/
 zip -9 \
 ../output/coedit.$ver.linux64.zip \
 $fld/dcd.license.txt $fld/coedit.license.txt \
-$fld/coedit $fld/cetodo $fld/cesyms \
+$fld/coedit $fld/dastworx \
 $fld/coedit.ico $fld/coedit.png \
 $fld/dcd-server $fld/dcd-client
 rm -rf coedit-x86_64
diff --git a/cesetup/zip-win32.bat b/cesetup/zip-win32.bat
index 9ee4cf96..030dbb7a 100644
--- a/cesetup/zip-win32.bat
+++ b/cesetup/zip-win32.bat
@@ -4,6 +4,6 @@ cd win32
 7z a -tzip -mx9^
  ..\output\coedit.%ver%.win32.zip^
  dcd.license.txt coedit.license.txt^
- coedit.exe cetodo.exe cesyms.exe^
+ coedit.exe dastworx.exe^
  coedit.ico coedit.png^
  dcd-server.exe dcd-client.exe
\ No newline at end of file