flatpaks
/
tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build id

master
Marko Semet 2020-12-25 15:31:40 +01:00
parent e2c434ebae
commit cde710d13e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sh
View File

@ -17,11 +17,12 @@ if [ -z "$4" ]; then
BUILD_DIR= exec flatpak-builder $3 --arch "$2" --sandbox --rebuild-on-sdk-change --bundle-sources "$BUILD_DIR" "$1"
else
HASH="$("$(dirname "$0")/hash_modules.py" --installed "$1" "$2" | sed -n '1p')" &&
ID="$(IFS=';' && "$(dirname "$0")/hash_modules.py" --get-id "$1" "$2" | read a b c && echo "$a/$b.Builds/$c")" &&
ID="$("$(dirname "$0")/hash_modules.py" --get-id "$1" "$2" | ( IFS=/; while read a b c; do echo "$a/$b.Builds/$c"; exit 1; done ) || exit 0; exit 1 )" &&
(
find '.flatpak-builder/build' '.flatpak-builder/cache' -delete ||
rm -rf ".flatpak-builder/build" '.flatpak-builder/cache'
) &&
BUILD_DIR= flatpak-builder $3 --arch "$2" --keep-build-dirs --sandbox --rebuild-on-sdk-change --bundle-sources --repo "$4" -s "WB_HASH='${HASH}'" "$BUILD_DIR" "$1" &&
echo -n "Export $ID: " &&
ostree commit --repo "$4" --owner-uid=0 --owner-gid=0 --no-xattrs --generate-sizes --skip-if-unchanged --tree=dir=.flatpak-builder/build --branch "$ID"
fi