RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:47:45 +00:00
Code Issues Activity Actions

Ports: Use clearer tag names for ./package.sh dev

Browse source 
The old names only made sense in the context of `./package.sh dev` but
that will not be the only context anymore very soon.
This commit is contained in:
Tim Schumacher 2023-09-06 23:46:11 +02:00
parent 9a828a76d2
commit b80760003e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ports/.port_include.sh
View file

@ -744,7 +744,7 @@ do_dev() {
git config core.autocrlf false git config core.autocrlf false
git add --all --force git add --all --force
git commit -a -m 'Initial import' git commit -a -m 'Initial import'
git tag import git tag source
fi fi
if [ -d "${PORT_META_DIR}/patches" ] && [ -n "$(find -L "${PORT_META_DIR}/patches" -maxdepth 1 -name '*.patch' -print -quit)" ]; then if [ -d "${PORT_META_DIR}/patches" ] && [ -n "$(find -L "${PORT_META_DIR}/patches" -maxdepth 1 -name '*.patch' -print -quit)" ]; then
@ -770,7 +770,7 @@ do_dev() {
done done
fi fi
git tag original git tag patched
popd popd
} }
@ -785,14 +785,14 @@ do_dev() {
launch_user_shell launch_user_shell
popd >/dev/null 2>&1 popd >/dev/null 2>&1
local original_hash="$(git -C "$workdir" rev-parse refs/tags/original)" local original_hash="$(git -C "$workdir" rev-parse refs/tags/patched)"
local current_hash="$(git -C "$workdir" rev-parse HEAD)" local current_hash="$(git -C "$workdir" rev-parse HEAD)"
# If the hashes are the same, we have no changes, otherwise generate patches # If the hashes are the same, we have no changes, otherwise generate patches
if [ "$original_hash" != "$current_hash" ] || [ "${force_patch_regeneration}" = "true" ]; then if [ "$original_hash" != "$current_hash" ] || [ "${force_patch_regeneration}" = "true" ]; then
>&2 echo "Note: Regenerating patches as there are changed commits in the port repo (started at $original_hash, now is $current_hash)" >&2 echo "Note: Regenerating patches as there are changed commits in the port repo (started at $original_hash, now is $current_hash)"
rm -fr "${PORT_META_DIR}"/patches/*.patch rm -fr "${PORT_META_DIR}"/patches/*.patch
git -C "$workdir" format-patch --no-numbered --zero-commit --no-signature --full-index refs/tags/import -o "$(realpath "${PORT_META_DIR}/patches")" git -C "$workdir" format-patch --no-numbered --zero-commit --no-signature --full-index refs/tags/source -o "$(realpath "${PORT_META_DIR}/patches")"
do_generate_patch_readme do_generate_patch_readme
fi fi
} }