libtest.sh (flatpak-1.8.2.tar.xz) | : | libtest.sh (flatpak-1.8.3.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 298 | skipping to change at line 298 | |||
if [ ! -d repos/${REPONAME} ]; then | if [ ! -d repos/${REPONAME} ]; then | |||
if [ "x${COLLECTION_ID}" != "x" ]; then | if [ "x${COLLECTION_ID}" != "x" ]; then | |||
collection_args=--collection-id=${COLLECTION_ID} | collection_args=--collection-id=${COLLECTION_ID} | |||
else | else | |||
collection_args= | collection_args= | |||
fi | fi | |||
mkdir -p repos | mkdir -p repos | |||
ostree --repo=repos/${REPONAME} init --mode=archive-z2 ${collection_args } | ostree --repo=repos/${REPONAME} init --mode=archive-z2 ${collection_args } | |||
fi | fi | |||
flatpak build-commit-from --disable-fsync --src-repo=${RUNTIME_REPO} --force ${GPGARGS} repos/${REPONAME} ${RUNTIME_REF} | flatpak build-commit-from --disable-fsync --no-update-summary --src-repo=${R UNTIME_REPO} --force ${GPGARGS} repos/${REPONAME} ${RUNTIME_REF} | |||
} | } | |||
httpd () { | httpd () { | |||
COMMAND=${1:-web-server.py} | COMMAND=${1:-web-server.py} | |||
DIR=${2:-repos} | DIR=${2:-repos} | |||
rm -f httpd-pipe | rm -f httpd-pipe | |||
mkfifo httpd-pipe | mkfifo httpd-pipe | |||
PYTHONUNBUFFERED=1 $(dirname $0)/$COMMAND "$DIR" 3> httpd-pipe 2>&1 | tee -- append httpd-log & | PYTHONUNBUFFERED=1 $(dirname $0)/$COMMAND "$DIR" 3> httpd-pipe 2>&1 | tee -- append httpd-log & | |||
read < httpd-pipe | read < httpd-pipe | |||
skipping to change at line 363 | skipping to change at line 363 | |||
update_repo () { | update_repo () { | |||
REPONAME=${1:-test} | REPONAME=${1:-test} | |||
COLLECTION_ID=${2:-org.test.Collection.${REPONAME}} | COLLECTION_ID=${2:-org.test.Collection.${REPONAME}} | |||
if [ x${USE_COLLECTIONS_IN_SERVER-} == xyes ] ; then | if [ x${USE_COLLECTIONS_IN_SERVER-} == xyes ] ; then | |||
collection_args=--collection-id=${COLLECTION_ID} | collection_args=--collection-id=${COLLECTION_ID} | |||
else | else | |||
collection_args= | collection_args= | |||
fi | fi | |||
if test -f repos/${REPONAME}/summary; then | ||||
sleep 1 # ensure we get a new timestamp on the summary files | ||||
fi | ||||
${FLATPAK} build-update-repo ${collection_args} ${GPGARGS:-${FL_GPGARGS}} ${ UPDATE_REPO_ARGS-} repos/${REPONAME} | ${FLATPAK} build-update-repo ${collection_args} ${GPGARGS:-${FL_GPGARGS}} ${ UPDATE_REPO_ARGS-} repos/${REPONAME} | |||
} | } | |||
make_updated_app () { | make_updated_app () { | |||
REPONAME=${1:-test} | REPONAME=${1:-test} | |||
if [ x${USE_COLLECTIONS_IN_SERVER-} == xyes ] ; then | if [ x${USE_COLLECTIONS_IN_SERVER-} == xyes ] ; then | |||
COLLECTION_ID=${2:-org.test.Collection.${REPONAME}} | COLLECTION_ID=${2:-org.test.Collection.${REPONAME}} | |||
else | else | |||
COLLECTION_ID="" | COLLECTION_ID="" | |||
fi | fi | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 5 lines changed or added |