From a3ee869ee9135e8c84c8cfd3cc3dd44b921303c7 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sun, 10 Jun 2018 10:09:35 +0200
Subject: [PATCH] Release prep

---
 tools/rc22/build-sdcard.sh | 40 ++++++++++++++------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/tools/rc22/build-sdcard.sh b/tools/rc22/build-sdcard.sh
index 946534429..7dd386c26 100644
--- a/tools/rc22/build-sdcard.sh
+++ b/tools/rc22/build-sdcard.sh
@@ -3,8 +3,8 @@
 set -e
 
 branch=2.2
-workdir=/home/opentx/rc22
-output=/media/HDD/www2/sdcard/rc
+workdir=/home/opentx/release22
+output=/var/www/html/2.2/release
 
 # Handle opentx.sdcard.version
 sdcard_version="2.2V"$(grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g')
@@ -25,27 +25,17 @@ else
 
   # Get images for Horus
   mkdir -p ${workdir}/sdcard/horus/IMAGES
-  imgdir=/home/opentx/horus-bitmaps
-  if [ "$(ls -A $imgdir)" ]; then
-    cp /$imgdir/* ${workdir}/sdcard/horus/IMAGES/
-  fi
-
-  # Get images for Taranis x9
-  mkdir -p ${workdir}/sdcard/taranis-x9/IMAGES
-  imgdir=/home/opentx/x9-bitmaps
-  if [ "$(ls -A $imgdir)" ]; then
-    cp $imgdir/* ${workdir}/sdcard/taranis-x9/IMAGES/
-  fi
+  cp /home/opentx/horus-bitmaps/* ${workdir}/sdcard/horus/IMAGES/
 
   # Request sound pack generation
-  python3 -B ${workdir}/code/tools/rc22/tts.py en csv files
-  python3 -B ${workdir}/code/tools/rc22/tts.py fr csv files
-  python3 -B ${workdir}/code/tools/rc22/tts.py es csv files
-  python3 -B ${workdir}/code/tools/rc22/tts.py it csv files
-  python3 -B ${workdir}/code/tools/rc22/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
-  python3 -B ${workdir}/code/tools/nightly22/tts.py ru csv psv files
+  ${workdir}/code/tools/release22/tts.py en csv files
+  ${workdir}/code/tools/release22/tts.py fr csv files
+  ${workdir}/code/tools/release22/tts.py es csv files
+  ${workdir}/code/tools/release22/tts.py it csv files
+  ${workdir}/code/tools/release22/tts.py de csv files
+  ${workdir}/code/tools/release22/tts.py cz csv files
+  ${workdir}/code/tools/release22/tts.py pt csv files
+  ${workdir}/code/tools/release22/tts.py ru csv psv files
 
   # Create sdcards.zips for supported platforms
   mv /tmp/SOUNDS ${workdir}/sdcard/horus/
@@ -53,8 +43,8 @@ else
   mkdir ${workdir}/sdcard/taranis-x7/SOUNDS
   cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x9/
   cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x7/
-  cd ${workdir}/sdcard/horus && zip -r ${output}/opentx-x12s/sdcard-horus-${sdcard_version}.zip *
-  cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/opentx-x9d/sdcard-taranis-x9-${sdcard_version}.zip *
-  cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/opentx-x7/sdcard-taranis-x7-${sdcard_version}.zip *
+  cd ${workdir}/sdcard/horus && zip -r ${output}/sdcard/opentx-x12s/sdcard-horus-${sdcard_version}.zip *
+  cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/opentx-x9d/sdcard-taranis-x9-${sdcard_version}.zip *
+  cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/opentx-x7/sdcard-taranis-x7-${sdcard_version}.zip *
   rm -Rf ${workdir}/sdcard
-fi
+fi
\ No newline at end of file