Skip to content

Commit

Permalink
SQUASH ME: missed a couple of s/rm/rm -f/g
Browse files Browse the repository at this point in the history
  • Loading branch information
fnothaft committed Dec 23, 2016
1 parent 2bd8ba9 commit 70fe5da
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions scripts/jenkins-test
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ find . -name pom.xml \
-exec sed -i.bak \
-e "s:sun.io.serialization.extendedDebugInfo=true:sun.io.serialization.extendedDebugInfo=true -Djava.io.tmpdir=${ADAM_MVN_TMP_DIR}:g" \
{} \;
find . -name "*.bak" -exec rm {} \;
find . -name "*.bak" -exec rm -f {} \;

# variable declarations
export PATH=${JAVA_HOME}/bin/:${PATH}
Expand Down Expand Up @@ -136,7 +136,7 @@ find . -name pom.xml \
-exec sed -i.bak \
-e "s:sun.io.serialization.extendedDebugInfo=true -Djava.io.tmpdir=${ADAM_MVN_TMP_DIR}:sun.io.serialization.extendedDebugInfo=true:g" \
{} \;
find . -name "*.bak" -exec rm {} \;
find . -name "*.bak" -exec rm -f {} \;

if test -n "$(git status --porcelain)"
then
Expand Down
2 changes: 1 addition & 1 deletion scripts/move_to_scala_2.10.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ find . -name "pom.xml" -exec sed -e "s/2.11.8/2.10.6/g" \
-e "s/2.11/2.10/g" -i.2.10.bak \
-e "/no Scala/ s/Scala 2.10/Scala 2.11/g" -i.2.10.bak \
'{}' \;
find . -name "*.2.10.bak" -exec rm {} \;
find . -name "*.2.10.bak" -exec rm -f {} \;
2 changes: 1 addition & 1 deletion scripts/move_to_scala_2.11.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ find . -name "pom.xml" -exec sed -e "s/2.10.6/2.11.8/g" \
find . -name "pom.xml" -exec sed -e "s/parquet-scala_2.11/parquet-scala_2.10/g" -i.2.11.2.bak '{}' \;
# keep maven-javadoc-plugin at version 2.10.3
find . -name "pom.xml" -exec sed -e "s/2.11.3/2.10.3/g" -i.2.11.3.bak '{}' \;
find . -name "*.2.11.*bak" -exec rm {} \;
find . -name "*.2.11.*bak" -exec rm -f {} \;

0 comments on commit 70fe5da

Please sign in to comment.