Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Telegram/BuildWin.bat

@@ -1,11 +1,6 @@
 @echo OFF
 
-set "AppVersionStrMajor=0.9"
-set "AppVersion=9000"
-set "AppVersionStrSmall=0.9"
-set "AppVersionStr=0.9.0"
-set "AppVersionStrFull=0.9.0.0"
-set "DevChannel=0"
+FOR /F "tokens=1,2* delims= " %i in (Version) do set "%i=%j"
 
 if %DevChannel% neq 0 goto preparedev
 

Telegram/DeployLinux.sh

@@ -1,7 +1,8 @@
-AppVersionStrMajor=`./Version.sh | awk -F " " '{print $1}'`
-AppVersion=`./Version.sh | awk -F " " '{print $2}'`
-AppVersionStr=`./Version.sh | awk -F " " '{print $3}'`
-DevChannel=`./Version.sh | awk -F " " '{print $4}'`
+while IFS='' read -r line || [[ -n "$line" ]]; do
+    set $line
+    eval $1="$2"
+done < Version
+
 DevPostfix=''
 if [ "$DevChannel" != "0" ]; then
   DevPostfix='.dev'

Telegram/DeployLinux32.sh

@@ -1,7 +1,8 @@
-AppVersionStrMajor=`./Version.sh | awk -F " " '{print $1}'`
-AppVersion=`./Version.sh | awk -F " " '{print $2}'`
-AppVersionStr=`./Version.sh | awk -F " " '{print $3}'`
-DevChannel=`./Version.sh | awk -F " " '{print $4}'`
+while IFS='' read -r line || [[ -n "$line" ]]; do
+    set $line
+    eval $1="$2"
+done < Version
+
 DevPostfix=''
 if [ "$DevChannel" != "0" ]; then
   DevPostfix='.dev'

Telegram/DeployMacWin.sh

@@ -1,7 +1,8 @@
-AppVersionStrMajor=`./Version.sh | awk -F " " '{print $1}'`
-AppVersion=`./Version.sh | awk -F " " '{print $2}'`
-AppVersionStr=`./Version.sh | awk -F " " '{print $3}'`
-DevChannel=`./Version.sh | awk -F " " '{print $4}'`
+while IFS='' read -r line || [[ -n "$line" ]]; do
+    set $line
+    eval $1="$2"
+done < Version
+
 DevPostfix=''
 if [ "$DevChannel" != "0" ]; then
   DevPostfix='.dev'

Telegram/PrepareLinux.sh

@@ -1,7 +1,8 @@
-AppVersionStrMajor=`./Version.sh | awk -F " " '{print $1}'`
-AppVersion=`./Version.sh | awk -F " " '{print $2}'`
-AppVersionStr=`./Version.sh | awk -F " " '{print $3}'`
-DevChannel=`./Version.sh | awk -F " " '{print $4}'`
+while IFS='' read -r line || [[ -n "$line" ]]; do
+    set $line
+    eval $1="$2"
+done < Version
+
 DevPostfix=''
 DevParam=''
 if [ "$DevChannel" != "0" ]; then

Telegram/PrepareLinux32.sh

@@ -1,7 +1,8 @@
-AppVersionStrMajor=`./Version.sh | awk -F " " '{print $1}'`
-AppVersion=`./Version.sh | awk -F " " '{print $2}'`
-AppVersionStr=`./Version.sh | awk -F " " '{print $3}'`
-DevChannel=`./Version.sh | awk -F " " '{print $4}'`
+while IFS='' read -r line || [[ -n "$line" ]]; do
+    set $line
+    eval $1="$2"
+done < Version
+
 DevPostfix=''
 DevParam=''
 if [ "$DevChannel" != "0" ]; then

Telegram/PrepareMac.sh

@@ -1,7 +1,8 @@
-AppVersionStrMajor=`./Version.sh | awk -F " " '{print $1}'`
-AppVersion=`./Version.sh | awk -F " " '{print $2}'`
-AppVersionStr=`./Version.sh | awk -F " " '{print $3}'`
-DevChannel=`./Version.sh | awk -F " " '{print $4}'`
+while IFS='' read -r line || [[ -n "$line" ]]; do
+    set $line
+    eval $1="$2"
+done < Version
+
 DevPostfix=''
 DevParam=''
 if [ "$DevChannel" != "0" ]; then

Telegram/Version

@@ -0,0 +1,6 @@
+AppVersion         9000
+AppVersionStrMajor 0.9
+AppVersionStrSmall 0.9
+AppVersionStr      0.9.0
+AppVersionStrFull  0.9.0.0
+DevChannel         0

Telegram/Version.sh

@@ -1,2 +0,0 @@
-echo 0.9 9000 0.9.0 0
-# AppVersionStrMajor AppVersion AppVersionStr DevChannel