From 2b46b82f9ccda30282615f87d5fa22d66c043a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 12 Jan 2025 18:05:35 +0100 Subject: [PATCH] [release] prevent overwriting ${CHANGELOG}.orig with truncated file to avoid deleting most of CHANGELOG.md by accident when the release.sh script gets interrupted halfway through, as happened during the v1.28.3 release in commit 7e8ca377fc0e4a7c4ecf517a5fcda52c9affd48b --- gallery_dl/version.py | 2 +- scripts/release.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gallery_dl/version.py b/gallery_dl/version.py index 6bceebda..d9c0ceee 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,5 +6,5 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.28.4" +__version__ = "1.28.5-dev" __variant__ = None diff --git a/scripts/release.sh b/scripts/release.sh index 3e64b6d0..5fa190aa 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -133,7 +133,7 @@ changelog() { -e "s*^## \w\+\$*## ${NEWVERSION} - $(date +%Y-%m-%d)*" \ "${CHANGELOG}" - mv "${CHANGELOG}" "${CHANGELOG}.orig" + mv --no-clobber -- "${CHANGELOG}" "${CHANGELOG}.orig" # - remove all but the latest entries sed -n \ @@ -157,7 +157,7 @@ upload-git() { cd "${ROOTDIR}" echo Pushing changes to github - mv "${CHANGELOG}.orig" "${CHANGELOG}" || true + mv -- "${CHANGELOG}.orig" "${CHANGELOG}" || true git add "gallery_dl/version.py" "${README}" "${CHANGELOG}" git commit -S -m "release version ${NEWVERSION}" git tag -s -m "version ${NEWVERSION}" "v${NEWVERSION}"