More changes

jenkins/nightly-21/release-companion.sh

@@ -21,9 +21,9 @@ cd opentx/radio/src
 make clean
 
 # create companion rpm
-rm -rf ${DIR}/companion-build/
+rm -rf   ${DIR}/companion-build/
 mkdir -p ${DIR}/companion-build/
-cd ${DIR}/companion-build/
+cd       ${DIR}/companion-build/
 cmake ../opentx/companion/src
 make package
 cp ./companion${version}-${release}${OPENTX_VERSION_SUFFIX}-i686.rpm ${DESTDIR}

jenkins/nightly-21/release-firmware.sh

@@ -7,11 +7,13 @@ set -x
 # make sure we are in the good directory
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 cd $DIR
-source ./version.sh
 
 # pull the latest changes
 ./update-repo.sh
 
+# retrieve release after the repo update
+source ./version.sh
+
 # make the stamp
 cd opentx/radio/src
 make clean
@@ -30,9 +32,9 @@ DESTDIR=/var/www/html/downloads-${version}/nightly/firmware
 # copy the stamp and the release-notes to the http server
 cd ${DIR}
 cp opentx/radio/src/stamp-opentx.txt ${DESTDIR}
-cp opentx/radio/releasenotes.txt ${DESTDIR}
+cp opentx/radio/releasenotes.txt     ${DESTDIR}
 cp opentx/radio/src/lua_fields_*.txt ${DESTDIR}
-echo ${OPENTX_VERSION_SUFFIX} > ${DESTDIR}/suffix.txt
+echo ${OPENTX_VERSION_SUFFIX} >      ${DESTDIR}/suffix.txt
 
 # erase all previous builds
 rm -f ${DESTDIR}/binaries/opentx*.hex

jenkins/release-21/release-firmware.sh

@@ -7,11 +7,13 @@ set -x
 # make sure we are in the good directory
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 cd $DIR
-source ./version.sh
 
 # pull the latest changes
 ./update-repo.sh
 
+# retrieve release after the repo update
+source ./version.sh
+
 # make the stamp
 cd opentx/radio/src
 make clean