Updated build script

This commit is contained in:
mboelen 2014-09-14 20:54:17 +02:00
parent 7a2daf92ad
commit a38b2bcc22

View File

@ -126,12 +126,12 @@
# Check binaries # Check binaries
BZRBINARY=`which bzr` GITBUILDPACKAGEBINARY=`which git-buildpackage`
if [ ! "${BZRBINARY}" = "" ]; then if [ ! "${GITBUILDPACKAGEBINARY}" = "" ]; then
echo "[=] bzr = ${BZRBINARY}" echo "[=] git-buildpackage = ${GITBUILDPACKAGEBINARY}"
else else
echo "[X] Can not find bzr binary" echo "[X] Can not find git-buildpackage binary"
echo " Hint: install bzr" echo " Hint: install git-buildpackage"
ExitFatal ExitFatal
fi fi
@ -235,29 +235,44 @@
echo "[*] Starting with DEB building process" echo "[*] Starting with DEB building process"
BZRSTATUS=`${BZRBINARY} status . 2>&1 > /dev/null; echo $?` DEBCHANGELOGFULLVERSION=`head -1 ../debian/changelog | awk '{ print $2 }' | sed 's/(//' | sed 's/)//'`
if [ "${BZRSTATUS}" = "0" ]; then
echo "[V] bzr has proper directory tree"
DEBCHANGELOGFULLVERSION=`head -1 debian/changelog | awk '{ print $2 }' | sed 's/(//' | sed 's/)//'`
DEBCHANGELOGVERSION=`echo ${DEBCHANGELOGFULLVERSION} | awk -F- '{ print $1 }'` DEBCHANGELOGVERSION=`echo ${DEBCHANGELOGFULLVERSION} | awk -F- '{ print $1 }'`
DEBCHANGELOGVERSIONREV=`echo ${DEBCHANGELOGFULLVERSION} | awk -F- '{ print $2 }'` DEBCHANGELOGVERSIONREV=`echo ${DEBCHANGELOGFULLVERSION} | awk -F- '{ print $2 }'`
echo "[=] Version in Debian changelog: ${DEBCHANGELOGVERSION} (revision: ${DEBCHANGELOGVERSIONREV})"
if [ "${LYNIS_VERSION}" = "${DEBCHANGELOGVERSION}" ]; then if [ "${LYNIS_VERSION}" = "${DEBCHANGELOGVERSION}" ]; then
echo "[V] Debian/changelog up-to-date" echo "[V] Debian/changelog up-to-date"
else else
echo "[X] Debian/changelog outdated" echo "[X] Debian/changelog outdated"
ExitFatal ExitFatal
fi fi
# execute command
# bzr builddeb . --build-dir ${DEBWORKDIR}/build-area/ --result-dir ${DEBWORKDIR} # BZRSTATUS=`${BZRBINARY} status . 2>&1 > /dev/null; echo $?`
elif [ "${BZRSTATUS}" = "3" ]; then # if [ "${BZRSTATUS}" = "0" ]; then
echo "[X] Tree is not initialized for BZR" # echo "[V] bzr has proper directory tree"
echo " Hint: run bzr init while being in lynis directory (or bzr init ..)" # DEBCHANGELOGFULLVERSION=`head -1 debian/changelog | awk '{ print $2 }' | sed 's/(//' | sed 's/)//'`
ExitFatal # DEBCHANGELOGVERSION=`echo ${DEBCHANGELOGFULLVERSION} | awk -F- '{ print $1 }'`
else # DEBCHANGELOGVERSIONREV=`echo ${DEBCHANGELOGFULLVERSION} | awk -F- '{ print $2 }'`
echo "[X] Unknown error" # echo "[=] Version in Debian changelog: ${DEBCHANGELOGVERSION} (revision: ${DEBCHANGELOGVERSIONREV})"
echo "Output: ${BZRSTATUS}" # if [ "${LYNIS_VERSION}" = "${DEBCHANGELOGVERSION}" ]; then
fi # echo "[V] Debian/changelog up-to-date"
# else
# echo "[X] Debian/changelog outdated"
## ExitFatal
# fi
# # execute command
# # bzr builddeb . --build-dir ${DEBWORKDIR}/build-area/ --result-dir ${DEBWORKDIR}
# elif [ "${BZRSTATUS}" = "3" ]; then
# echo "[X] Tree is not initialized for BZR"
# echo " Hint: run bzr init while being in lynis directory (or bzr init ..)"
# ExitFatal
# else
# echo "[X] Unknown error"
# echo "Output: ${BZRSTATUS}"
# fi
cd ..
git-buildpackage --git-tarball-dir=${MYBUILDIDR} --git-export-dir=${DEBWORKDIR}
cd ${MYWORKDIR}
echo "[V] Done" echo "[V] Done"