From 79d9359e56dbb6b0565cdb0f6756afee7623a0a7 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sat, 13 May 2017 11:46:13 +0200
Subject: [PATCH] More release prep

---
 companion/src/mainwindow.cpp     | 15 +++++++--------
 tools/release22/build-release.sh |  1 +
 tools/release22/build-sdcard.sh  |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index cf511982a..cab0088a0 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -58,17 +58,16 @@
 
 #ifdef __APPLE__
   #define COMPANION_STAMP                 "companion-macosx.stamp"
-  #define COMPANION_INSTALLER             "companion-macosx-%1.dmg"
-#else
+  #define COMPANION_INSTALLER             ""  // no automatated updates for MacOsx
+#elif WIN32
   #define COMPANION_STAMP                 "companion-windows.stamp"
-  #define COMPANION_INSTALLER             "companion-windows-%1.exe"
+  #define COMPANION_INSTALLER             "windows/companion-windows-%1.exe"
+#else
+#define COMPANION_STAMP                   "companion-linux.stamp"
+#define COMPANION_INSTALLER               ""   // no automatated updates for linux
 #endif
 
-#ifdef WIN32
-  #define OPENTX_NIGHT_COMPANION_DOWNLOADS  "http://downloads-22.open-tx.org/nightly/companion/windows"
-#else
-  #define OPENTX_NIGHT_COMPANION_DOWNLOADS  "http://downloads-22.open-tx.org/nightly/companion/linux"
-#endif
+#define OPENTX_NIGHT_COMPANION_DOWNLOADS  "http://downloads-22.open-tx.org/nightlies/companion"
 
 MainWindow::MainWindow():
   downloadDialog_forWait(NULL),
diff --git a/tools/release22/build-release.sh b/tools/release22/build-release.sh
index b3b262964..ff87c9014 100755
--- a/tools/release22/build-release.sh
+++ b/tools/release22/build-release.sh
@@ -52,6 +52,7 @@ fi
 cp -f  $workdir/binaries/stamp-opentx.txt ${output}/firmware
 echo "#define VERSION  "'"2.2.0"' > ${output}/companion/companion-windows.stamp
 cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-macosx.stamp
+cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-linux.stamp
 
 
 # Clean binaries It will be hosting built on demand firmware
diff --git a/tools/release22/build-sdcard.sh b/tools/release22/build-sdcard.sh
index e7718f8f2..ffff77ba2 100644
--- a/tools/release22/build-sdcard.sh
+++ b/tools/release22/build-sdcard.sh
@@ -33,6 +33,8 @@ else
   python3 -B ${workdir}/code/tools/release22/tts.py es csv files
   python3 -B ${workdir}/code/tools/release22/tts.py it csv files
   python3 -B ${workdir}/code/tools/release22/tts.py de csv files
+  python3 -B ${workdir}/code/tools/nightly22/tts.py cz csv files
+  python3 -B ${workdir}/code/tools/nightly22/tts.py pt csv files
 
   # Create sdcards.zips for supported platforms
   mv /tmp/SOUNDS ${workdir}/sdcard/horus/