[Vagrant] Check if file exists before adding CRC info and quiet ZIP

This commit is contained in:
Gijs Noorlander
2019-09-02 12:59:45 +02:00
parent a68dc433a3
commit 8b9f66e465
2 changed files with 17 additions and 14 deletions
+14 -11
View File
@@ -95,16 +95,19 @@ do
MAX_FILESIZE=1900544
fi
FILESIZE=$(stat -c%s ${BINARY_PATH}/${ENV}/firmware.bin )
if (( FILESIZE < MAX_FILESIZE )); then
echo
echo "### Deploying environment $ENV for version $VERSION"
BIN=${BINARY_PATH}/${ENV}/ESP_Easy_${VERSION}_${ENV}.bin
cp ${BINARY_PATH}/${ENV}/firmware.bin $BIN
python2 crc2.py $BIN
mv $BIN "${TMP_DIST}/bin/ESP_Easy_${VERSION}_${ENV}.bin"
else
echo "Build too large for $ENV $FILESIZE > $MAX_FILESIZE "
FIRMWARE_BIN=`echo "${BINARY_PATH}/${ENV}/firmware.bin"`
if [ -f $FIRMWARE_BIN ]; then
FILESIZE=$(stat -c%s `echo "${FIRMWARE_BIN}"` )
if (( FILESIZE < MAX_FILESIZE )); then
echo
echo "### Deploying environment $ENV for version $VERSION"
BIN=${BINARY_PATH}/${ENV}/ESP_Easy_${VERSION}_${ENV}.bin
cp ${FIRMWARE_BIN} $BIN
python2 crc2.py $BIN
mv $BIN "${TMP_DIST}/bin/ESP_Easy_${VERSION}_${ENV}.bin"
else
echo "Build too large for $ENV $FILESIZE > $MAX_FILESIZE "
fi
fi
ELFFILE=`echo "${BINARY_PATH}/${ENV}/firmware.elf"`
@@ -128,7 +131,7 @@ cd ${TMP_DIST}
echo
echo "### Creating zip archive"
zip ${CURPATH}/ESPEasy_$VERSION.zip -r .
zip -qq ${CURPATH}/ESPEasy_$VERSION.zip -r .
rm -Rf ${TMP_DIST}/* 2>/dev/null
rmdir ${TMP_DIST}
+3 -3
View File
@@ -53,7 +53,7 @@ PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e ${PIO_BUILD
# rename and check file
DATE=`date +%Y%m%d`
DESCRIPTION = `echo "${DATE}_${PIO_BUILDENV}_vagrant"`
${SRC}/before_deploy ${DESCRIPTION}
DESCRIPTION=`echo "${DATE}_vagrant"`
${SRC}/before_deploy -d ${DESCRIPTION}
mkdir -p /vagrant/build
mv *.zip /vagrant/build/
mv *.zip /vagrant/build/