You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2018/08/19 12:43:59 UTC
[12/50] logging-log4cxx git commit: Only remove "release" node if
somewhat necessary.
Only remove "release" node if somewhat necessary.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/80154a0f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/80154a0f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/80154a0f
Branch: refs/heads/master
Commit: 80154a0f5bdbd5993dc43fe1733ea36d915483a4
Parents: cef8058
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:51:39 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:51:39 2017 +0200
----------------------------------------------------------------------
releasePurge.sh | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/80154a0f/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
index 8f17bb7..b501451 100755
--- a/releasePurge.sh
+++ b/releasePurge.sh
@@ -25,7 +25,9 @@
function main()
{
purge_branch_and_tag
- revert_pom_and_changes
+ revert_pom
+ revert_changes
+ commit_reverts
}
function purge_branch_and_tag()
@@ -42,22 +44,32 @@ function purge_branch_and_tag()
done
}
-function revert_pom_and_changes()
+function revert_pom()
{
- # Remove not needed "release" node.
sed -i -r "s/^(\t<version>).+(<)/\10.11.0-SNAPSHOT\2/" "pom.xml"
- sed -i -r "1,/.+<release.+/ s/.+<release.+//" "src/changes/changes.xml"
- sed -i -r "1,/.+date=.+/ s/.+date=.+//" "src/changes/changes.xml"
- sed -i -r "1,/.+description=.+/ s/.+description=.+//" "src/changes/changes.xml"
- sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//" "src/changes/changes.xml"
+}
+
+function revert_changes()
+{
+ if [ -n "$(grep "version=\"0.11.1\"" "src/changes/changes.xml")" ]
+ then
+ # Remove not needed "release" node.
+ sed -i -r "1,/.+<release.+/ s/.+<release.+//" "src/changes/changes.xml"
+ sed -i -r "1,/.+date=.+/ s/.+date=.+//" "src/changes/changes.xml"
+ sed -i -r "1,/.+description=.+/ s/.+description=.+//" "src/changes/changes.xml"
+ sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//" "src/changes/changes.xml"
- # Don't know how to remove the left newlines easier...
- local changes=$(cat "src/changes/changes.xml")
- echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
+ # Don't know how to remove the left newlines easier...
+ local changes=$(cat "src/changes/changes.xml")
+ echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
+ fi
# Last release date needs to be "unknown":
sed -i -r "1,/.+date=.+/ s/date=\".+\"/date=\"XXXX-XX-XX\"/" "src/changes/changes.xml"
+}
+function commit_reverts()
+{
git add "pom.xml"
git add "src/changes/changes.xml"