X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=build.xml;h=f03eca76c781f71abd573cbf1601af4f393197b1;hb=5307c3e0f522693698fa77ba82b7e6108f64bdfe;hp=d5b95abc1b0d4ae95d2a715f453b1a4491a66652;hpb=5b63545e9b35c41f8130ecce5d3e787fad74478a;p=gigi.git

diff --git a/build.xml b/build.xml
index d5b95abc..f03eca76 100644
--- a/build.xml
+++ b/build.xml
@@ -84,9 +84,9 @@
 	<target depends="clean,clean-test" name="cleanall" />
 	<target depends="build-project, build-testing, native" name="build" />
 	<target depends="init" name="build-project">
-		<exec outputproperty="git-version" executable="git">
-			<arg line="rev-parse"/>
-			<arg line="HEAD"/>
+		<exec outputproperty="git-version" executable="sh">
+			<arg value="-c"/>
+			<arg value="git describe HEAD --tags --match &quot;v*&quot; | sed &quot;s/^v//&quot;"/>
 		</exec>
 		<manifest file="Gigi.MF">
 			<attribute name="Main-Class" value="club.wpia.gigi.Launcher" />
@@ -355,10 +355,6 @@
 	</target>
 	<target name="update-effective-tlds">
 		<mkdir dir="bin/club/wpia/gigi/util"/>
-		<exec executable="wget" dir="bin/club/wpia/gigi/util">
-			<arg value="-N"/>
-			<arg value="-q"/>
-			<arg value="https://publicsuffix.org/list/effective_tld_names.dat"/>
-		</exec>
+		<copy file="/usr/share/publicsuffix/effective_tld_names.dat" tofile="bin/club/wpia/gigi/util/effective_tld_names.dat"/>
 	</target>
 </project>