Merge remote-tracking branch 'origin/master'

cleanup_builds.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-OLD_TRAVIS_BUILD_NUMBER=`expr $TRAVIS_BUILD_NUMBER - 7`
-OLD_DESKFILE=$OLD_TRAVIS_BUILD_BUMBER"-desktop-bleeding-edge.jar"
-OLD_FILE1="Bleeding-Edge-Build-"$OLD_TRAVIS_BUILD_NUMBER".md"
-
-if [ -e $OLD_FILE1 ]; then
-    rm -f $OLD_FILE1
-    rm -f $OLD_DESKFILE
-    git add $OLD_FILE1
-    git add $OLD_DESKFILE
-fi

upload-build.sh

@@ -8,16 +8,23 @@ git config --global user.name $GHUSERNAME
 git clone https://github.com/Anuken/Mindustry.wiki.git
 cd Mindustry.wiki
 
-DESKFILE=$TRAVIS_BUILD_NUMBER"-desktop-bleeding-edge.jar"
+DESKFILE="mindustry-desktop-bleeding-edge.jar"
-cp ../desktop/build/libs/desktop-release.jar $DESKFILE
 
-FILE1="Bleeding-Edge-Build-"$TRAVIS_BUILD_NUMBER".md"
+if [ -e $DESKFILE ]; then
-
+    rm $DESKFILE
-if [ ! -e $FILE1 ]; then
-    touch $FILE1
 fi
 
-echo "### Commit #"$TRAVIS_COMMIT"." >> $FILE1
+cp ../desktop/build/libs/desktop-release.jar $DESKFILE
+
+FILE1="Bleeding-Edge-Build.md"
+
+if [ -e $FILE1 ]; then
+    rm $FILE1
+fi
+
+touch $FILE1
+
+echo "###Build #"$TRAVIS_BUILD_NUMBER", Commit #"$TRAVIS_COMMIT"." >> $FILE1
 echo >> $FILE1
 echo "Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1
 
@@ -25,7 +32,4 @@ git add $FILE1
 git add $DESKFILE
 git commit -m "Added a new bleeding edge build"
 
-# now remove old build
-bash ../cleanup_builds.sh
-
 git push https://$GHUSERNAME:$GHPASSWORD@github.com/Anuken/Mindustry.wiki.git --all