From 2d9d05f00ec89876a13bc58bed2bd70b77ee02b5 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 20 Aug 2015 15:59:11 +0700
Subject: [PATCH] Fix spaces, add time to yandex

---
 .travis.yml    | 4 ++--
 gen-version.sh | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d1ac548..cbf853de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,5 +28,5 @@ script:
   - sh gen-version.sh travis build
   - ant debug
 after_script:
-  - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d-%H-%M`.apk
-  - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date +%d-%m-%y`-`git rev-parse --short HEAD`.apk
+  - curl --upload-file bin/xashdroid-debug.apk https://transfer.sh/xash3d-armv7-`date -u +%y-%m-%d_%H-%M`.apk
+  - curl -T bin/xashdroid-debug.apk -u $YADISK_USERNAME:$YADISK_PASSWORD https://webdav.yandex.ru/XashTestVersions/xashdroid-armv7-`date -u +%y-%m-%d_%H-%M`-`git rev-parse --short HEAD`.apk
diff --git a/gen-version.sh b/gen-version.sh
index d080d8ea..72d5ea8e 100755
--- a/gen-version.sh
+++ b/gen-version.sh
@@ -2,7 +2,7 @@ git update-index --assume-unchanged res/values/git-rev.xml
 echo '<?xml version="1.0" encoding="utf-8"?>' > res/values/git-rev.xml
 echo '<resources>' >> res/values/git-rev.xml
 echo -n '<string name="git_revisions">' >> res/values/git-rev.xml
-echo -n '<b>Version information:</b>'$*_endl| sed -e s/_endl/'\\n'/ >> res/values/git-rev.xml
+echo -n '<b>Version information:</b> ' $*_endl| sed -e s/_endl/'\\n'/ >> res/values/git-rev.xml
 echo -n '<b>android:</b>' $(git log --abbrev-commit --pretty=oneline -1) _endl\
 '<b>engine:</b>' $(cd jni/src/Xash3D/*/;git log --abbrev-commit --pretty=oneline -1) _endl\
 '<b>client:</b>' $(cd jni/src/XashXT/*/;git log --abbrev-commit --pretty=oneline -1) _endl\
@@ -10,9 +10,8 @@ echo -n '<b>android:</b>' $(git log --abbrev-commit --pretty=oneline -1) _endl\
 '<b>SDL2:</b>' $(cd jni/src/SDL2/*/;git log --abbrev-commit --pretty=oneline -1) _endl\
 '<b>TouchControls:</b>' $(cd jni/src/MobileTouchControls/*/;git log --abbrev-commit --pretty=oneline -1) _endl\
 '<b>nanogl:</b>' $(cd jni/src/NanoGL/*/;git log --abbrev-commit --pretty=oneline -1)_endl\
- | sed -e s/\'/\\\\\'/g -e s/_endl/'\\n'/g >> res/values/git-rev.xml
-echo -n ' ' $USER@$HOSTNAME >> res/values/git-rev.xml
-echo -n $(date +%H:%M:%S-%d-%m-%y) >> res/values/git-rev.xml
+ | sed -e s/\'//g -e s/_endl/'\\n'/g >> res/values/git-rev.xml
+echo -n $USER@$(hostname) $(date +%H:%M:%S-%d-%m-%y) >> res/values/git-rev.xml
 echo '</string>' >> res/values/git-rev.xml
 echo '</resources>' >> res/values/git-rev.xml
 cat res/values/git-rev.xml