diff --git a/tools/rc22/build-rc.sh b/tools/rc22/build-rc.sh index cf155bfb9..c0cd0bcdb 100755 --- a/tools/rc22/build-rc.sh +++ b/tools/rc22/build-rc.sh @@ -5,7 +5,7 @@ set -e branch=2.2 docker=rc22 workdir=/home/opentx/rc22 -output=/var/www/html/2.2 +output=/var/www/html/2.2/rc version=2.2.1 # Incrementnightly index diff --git a/tools/rc22/build-sdcard.sh b/tools/rc22/build-sdcard.sh index 3d1a8e34e..0579ba5a4 100644 --- a/tools/rc22/build-sdcard.sh +++ b/tools/rc22/build-sdcard.sh @@ -4,7 +4,7 @@ set -e branch=2.2 workdir=/home/opentx/rc22 -output=/var/www/html/2.2 +output=/media/HDD/www2/sdcard/rc # Handle opentx.sdcard.version sdcard_version="2.2V"$(grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g') @@ -46,8 +46,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}/sdcard/x12/sdcard-horus-${sdcard_version}.zip * - cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/x9/sdcard-taranis-x9-${sdcard_version}.zip * - cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/x7/sdcard-taranis-x7-${sdcard_version}.zip * + cd ${workdir}/sdcard/horus && zip -r ${output}/x12/sdcard-horus-${sdcard_version}.zip * + cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/x9/sdcard-taranis-x9-${sdcard_version}.zip * + cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/x7/sdcard-taranis-x7-${sdcard_version}.zip * rm -Rf ${workdir}/sdcard fi