From 2b5182b56acd8cf4ead6075c251f1adea8526c71 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Sat, 18 Mar 2017 17:37:58 +0100
Subject: [PATCH] Fixed run.sh and replaced depricated cmd in build.xml

---
 build.xml | 19 ++++++++++++-------
 run.sh    |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index d2047cc6..8c81a98a 100755
--- a/build.xml
+++ b/build.xml
@@ -111,13 +111,18 @@
 	</target>
 
 	<target name="package" depends="build">
-		<copy file="${gitRoot}/hal.conf.example" todir="${releaseDir}" />
-		<copy file="${gitRoot}/hal-default.db" todir="${releaseDir}" />
-		<copy file="${gitRoot}/logging.properties" todir="${releaseDir}" />
-		<copy file="${gitRoot}/run.sh" todir="${releaseDir}" />
-		<copydir src="${libDir}" dest="${releaseDir}/lib"
-				 excludes="junit-*.jar,hamcrest-*.jar" />
-		<copydir src="resource/web" dest="${releaseDir}/resource/web" />
+		<copy todir="${releaseDir}" >
+			<fileset file="${gitRoot}/hal.conf.example" />
+			<fileset file="${gitRoot}/hal-default.db" />
+			<fileset file="${gitRoot}/logging.properties" />
+			<fileset file="${gitRoot}/run.sh" />
+		</copy>
+		<copy  todir="${releaseDir}/lib">
+			<fileset dir="${libDir}" excludes="junit-*.jar,hamcrest-*.jar" />
+		</copy>
+		<copy  todir="${releaseDir}/resource/web">
+			<fileset dir="resource/web" />
+		</copy>
 		<jar destfile="${releaseDir}/hal.jar" basedir="${buildDir}" />
 	</target>
 
diff --git a/run.sh b/run.sh
index 9f374dea..adf94c50 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ant clean
-ant release
+ant package
 # Kill current session
 screen -S hal -X kill
 # Start new session