summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2010-06-15 19:34:52 -0400
committerCode Review <codereview-daemon@eclipse.org>2010-06-15 19:34:52 -0400
commit93ccd4a7fe0bbb29ff76ef2b594a7421a81df183 (patch)
tree4015f3c66a161d3a0fde597d84331c07d3d4f565
parent8a11ac3d69973bed6db88cd89faca63bdabe76b5 (diff)
parent200f3caefc6c24512c01f6ce8aa5b0a7063a7dbf (diff)
downloadjgit-93ccd4a7fe0bbb29ff76ef2b594a7421a81df183.tar.gz
jgit-93ccd4a7fe0bbb29ff76ef2b594a7421a81df183.zip
Merge "tools/version.sh: Use backup files on Win32"
-rwxr-xr-xtools/version.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/version.sh b/tools/version.sh
index 922d450c79..2b9fdfadae 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -109,13 +109,13 @@ API_N=$(perl -e '
print "$a.$b.0";
' "$API_V")
-perl -pi -e '
+perl -pi~ -e '
s/^(Bundle-Version:\s*).*$/${1}'"$OSGI_V"'/;
s/(org.eclipse.jgit.*;version=")[^"[(]*(")/${1}'"$API_V"'${2}/;
s/(org.eclipse.jgit.*;version="\[)[^"]*(\)")/${1}'"$API_V,$API_N"'${2}/;
' $(git ls-files | grep META-INF/MANIFEST.MF)
-perl -pi -e '
+perl -pi~ -e '
if ($ARGV ne $old_argv) {
$seen_version = 0;
$old_argv = $ARGV;
@@ -126,11 +126,11 @@ perl -pi -e '
}
' org.eclipse.jgit.packaging/org.*.feature/feature.xml
-perl -pi -e '
+perl -pi~ -e '
s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>};
' org.eclipse.jgit.packaging/org.*.feature/pom.xml
-perl -pi -e '
+perl -pi~ -e '
if ($ARGV ne $old_argv) {
$seen_version = 0;
$old_argv = $ARGV;
@@ -141,7 +141,7 @@ perl -pi -e '
}
' org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml
-perl -pi -e '
+perl -pi~ -e '
if ($ARGV ne $old_argv) {
$seen_version = 0;
$old_argv = $ARGV;
@@ -152,4 +152,5 @@ perl -pi -e '
}
' $(git ls-files | grep pom.xml)
+find . -name '*~' | xargs rm -f
git diff