From 71687e9591358717ac11a894b4f7570367c6738f Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Thu, 11 Jan 2018 00:29:06 +0300 Subject: [PATCH] Stop using pushd/popd in travis scripts --- set-version.sh | 12 ++++++------ upload-files.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/set-version.sh b/set-version.sh index c59764c23..beea671a0 100755 --- a/set-version.sh +++ b/set-version.sh @@ -2,18 +2,18 @@ mvn versions:set -DnewVersion=$1 -DgenerateBackupPoms=false -pushd tools/eclipse +cd tools/eclipse mvn tycho-versions:set-version -DnewVersion=$2 -pushd core-plugin +cd core-plugin sed -r -i -e "s/(.+)<\/version>/$1<\/version>/" dep-pom.xml sed -r -i -e "s/(lib\/teavm(-[a-z]+)+)-.+\.jar/\1-$1.jar/" build.properties sed -r -i -e "s/(lib\/teavm(-[a-z]+)+)-.+\.jar/\1-$1.jar/" META-INF/MANIFEST.MF -popd +cd .. -pushd m2e-plugin +cd m2e-plugin sed -r -i -e "s/.+<\/versionRange>/$1<\/versionRange>/" lifecycle-mapping-metadata.xml -popd +cd .. -popd +cd ../.. diff --git a/upload-files.sh b/upload-files.sh index 1ab577ecd..fcaa995b6 100755 --- a/upload-files.sh +++ b/upload-files.sh @@ -29,8 +29,8 @@ curl --ftp-create-dirs -T .idea-repository.xml \ # # Upload Eclipse plugin # -pushd tools/eclipse/updatesite/target/repository +cd tools/eclipse/updatesite/target/repository find . -type f -exec curl \ --ftp-create-dirs \ -u $TEAVM_FTP_LOGIN:$TEAVM_FTP_PASSWORD -T {} ftp://$TEAVM_FTP_HOST/httpdocs/eclipse/update-site/$BASE_VERSION-dev \; -popd \ No newline at end of file +cd ../../../../.. \ No newline at end of file