From c9b6a3f01c0b7a5ae795a678d486d1df12a96ba8 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Fri, 21 Dec 2012 20:53:51 +0000
Subject: [PATCH] Instead of deleting the empty directory placeholders, let's
 just not copy them to pkg-temp to begin with.

---
 build.xml                          | 2 +-
 installer/install.xml              | 6 ------
 installer/resources/postinstall.sh | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 842ad7410..9bcc15e5c 100644
--- a/build.xml
+++ b/build.xml
@@ -867,7 +867,7 @@
         <!-- Eepsite stuff here -->
         <mkdir dir="pkg-temp/eepsite" />
         <copy todir="pkg-temp/eepsite/" >
-            <fileset dir="installer/resources/eepsite/" />
+            <fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" />
         </copy>
         <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
             <fileset dir="installer/resources/icons/flags/" includes="cn.png de.png es.png fr.png ir.png it.png jp.png nl.png ru.png se.png us.png" />
diff --git a/installer/install.xml b/installer/install.xml
index a3c28d57f..522a199e3 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -196,12 +196,6 @@
                 <args><arg value="$INSTALL_PATH/man" /></args></executable>
             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
                 <args><arg value="$INSTALL_PATH/locale" /></args></executable>
-            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
-                <args><arg value="$INSTALL_PATH\eepsite\webapps\.placeholder" /></args></executable>
-            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
-                <args><arg value="$INSTALL_PATH\eepste\logs\.placeholder" /></args></executable>
-            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
-                <args><arg value="$INSTALL_PATH\eepsite\cgi-bin\.placeholder" /></args></executable>
             <!-- Placeholder for an OSX 'shortcut' to the router console
             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
                 <args><arg value="$INSTALL_PATH/I2P Router Console.webloc" /></args></executable>
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index 4c4065baf..4003d2d57 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -117,7 +117,6 @@ rm -f ./lib/*.dll
 rm -f ./*.bat
 rm -f ./*.cmd
 rm -f ./*.exe
-rm -f ./eepsite/*/.placeholder
 rm -rf ./installer
 
 if [ ! `echo $HOST_OS  |grep osx` ]; then