From 17e5595dd0b40cac235e12fa16fe206ff3c0708b Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 12 Nov 2014 23:10:19 +0000
Subject: [PATCH] Don't overwrite index.html and robots.txt in the update More
 build and clean fixes

---
 build.xml                                      | 16 ++++++++++++++--
 {plugin/eepsite/docroot => scripts}/index.html |  0
 {plugin/eepsite/docroot => scripts}/robots.txt |  0
 3 files changed, 14 insertions(+), 2 deletions(-)
 rename {plugin/eepsite/docroot => scripts}/index.html (100%)
 rename {plugin/eepsite/docroot => scripts}/robots.txt (100%)

diff --git a/build.xml b/build.xml
index 7171c12..e2804d5 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,11 @@
     </target>
 
     <target name="plugin" depends="war"> 
-        <delete file="plugin/i2ptunnel.config" />
+        <delete>
+           <!-- in installer but not update -->
+           <fileset dir="plugin/" includes="i2ptunnel.config zzzot.config eepsite/docroot/index.html eepsite/docroot/robots.txt" />
+        </delete>
+        <delete dir="plugin/eepsite/docroot/torrents/" />
         <!-- get version number -->
         <buildnumber file="scripts/build.number" />
         <property name="release.number" value="0.11.0" />
@@ -48,9 +52,13 @@
         <move file="zzzot.su3" tofile="zzzot-update.su3" overwrite="true" />
 
         <!-- make the install xpi2p -->
-        <copy file="scripts/i2ptunnel.config" todir="plugin/" overwrite="true" />
         <copy file="scripts/plugin.config" todir="plugin/" overwrite="true" />
+        <!-- Files in installer but not update. Be sure to Add to delete fileset above and clean target below -->
+        <copy file="scripts/i2ptunnel.config" todir="plugin/" overwrite="true" />
         <copy file="scripts/zzzot.config" todir="plugin/" overwrite="true" />
+        <copy file="scripts/index.html" todir="plugin/eepsite/docroot/" overwrite="true" />
+        <copy file="scripts/robots.txt" todir="plugin/eepsite/docroot/" overwrite="true" />
+        <mkdir dir="plugin/eepsite/docroot/torrents/" />
         <exec executable="echo" osfamily="unix" failonerror="true" output="plugin/plugin.config" append="true">
             <arg value="version=${release.number}-b${build.number}" />
         </exec>
@@ -65,6 +73,9 @@
         <ant dir="src" target="clean" />
         <delete file="plugin/i2ptunnel.config" />
         <delete file="plugin/plugin.config" />
+        <delete file="plugin/zzzot.config" />
+        <delete file="plugin/eepsite/docroot/index.html" />
+        <delete file="plugin/eepsite/docroot/robots.txt" />
         <delete file="plugin/lib/zzzot.jar.pack" />
         <delete file="plugin/eepsite/webapps/tracker.war.pack" />
         <delete file="plugin/LICENSE.txt" />
@@ -74,6 +85,7 @@
         <delete file="zzzot.su3" />
         <delete file="zzzot-update.su3" />
         <delete file="plugin.zip" />
+        <delete dir="plugin/eepsite/docroot/torrents/" />
     </target>
 
 </project>
diff --git a/plugin/eepsite/docroot/index.html b/scripts/index.html
similarity index 100%
rename from plugin/eepsite/docroot/index.html
rename to scripts/index.html
diff --git a/plugin/eepsite/docroot/robots.txt b/scripts/robots.txt
similarity index 100%
rename from plugin/eepsite/docroot/robots.txt
rename to scripts/robots.txt