diff --git a/basic_creator.sh b/basic_creator.sh index d0fdfcc..c8f3e2a 100755 --- a/basic_creator.sh +++ b/basic_creator.sh @@ -15,7 +15,7 @@ error() { # eg: all of openstack, pnp, bat, cloud stuff, non-basic scripting language bundles ${SWUPDREPO}/mk_groups_ini.sh -PREVREL=`cat ${UPDATEDIR}/image/latest.version` +PREVREL=`cat ${UPDATEDIR}/image/LAST_VER` export SWUPD_CERTS_DIR=${SWUPD_CERTS_DIR:-"/root/swupd-certs"} export LEAF_KEY="leaf.key.pem" @@ -46,7 +46,7 @@ for job in $(jobs -p); do done # expose the new build to staging / testing -echo ${VER} > ${UPDATEDIR}/image/latest.version +echo ${VER} > ${UPDATEDIR}/image/LAST_VER STAGING_FILE="${UPDATEDIR}/www/version/formatstaging/latest" if [ ! -f "${STAGING_FILE}" ]; then diff --git a/mk_groups_ini.sh b/mk_groups_ini.sh index a2924d4..d9667d3 100755 --- a/mk_groups_ini.sh +++ b/mk_groups_ini.sh @@ -18,8 +18,8 @@ if [ ! -f "$SWUPD_SERVER_INI" ]; then sed -i "s|/var/lib/update|$UPDATEDIR|" $SWUPD_SERVER_INI fi -if [ ! -f "$UPDATEDIR/image/latest.version" ]; then - echo "0" > $UPDATEDIR/image/latest.version +if [ ! -f "$UPDATEDIR/image/LAST_VER" ]; then + echo "0" > $UPDATEDIR/image/LAST_VER fi echo "rebuilding $SWUPD_GROUPS_INI based on $BUNDLEREPO" diff --git a/test/functional/swupdlib.bash b/test/functional/swupdlib.bash index 1c0d262..384f40e 100644 --- a/test/functional/swupdlib.bash +++ b/test/functional/swupdlib.bash @@ -27,7 +27,7 @@ init_server_ini() { } set_latest_ver() { - echo "$1" > $DIR/image/latest.version + echo "$1" > $DIR/image/LAST_VER } init_groups_ini() {