Skip to content

Commit

Permalink
fix sed "-i" args
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-williams authored and fnothaft committed Oct 7, 2016
1 parent d242a26 commit a0730f3
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ adam*.jar
build
*~
#*
*.bak
*.bam*
*.adam*
*.log
Expand Down
2 changes: 1 addition & 1 deletion scripts/jenkins-test
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ADAM_MVN_TMP_DIR=$(mktemp -d -t adamTestMvnXXXXXXX)

# add this tempdir to the poms...
find . -name pom.xml \
-exec sed -i .bak \
-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 {} \;
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 @@ -2,5 +2,5 @@

set +x

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 '{}' \;
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 '{}' \;
find . -name "*.2.10.bak" -exec rm {} \;
6 changes: 3 additions & 3 deletions scripts/move_to_scala_2.11.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

set +x

find . -name "pom.xml" -exec sed -e "s/2.10.6/2.11.8/g" -e "s/2.10/2.11/g" -i .2.11.bak '{}' \;
find . -name "pom.xml" -exec sed -e "s/2.10.6/2.11.8/g" -e "s/2.10/2.11/g" -i.2.11.bak '{}' \;
# keep parquet-scala at parquet-scala_2.10
find . -name "pom.xml" -exec sed -e "s/parquet-scala_2.11/parquet-scala_2.10/g" -i .2.11.2.bak '{}' \;
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 "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 {} \;
2 changes: 1 addition & 1 deletion scripts/move_to_spark_2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ find . -name "pom.xml" -exec sed \
-e "/utils-/ $substitution_cmd" \
-e "/adam-/ $substitution_cmd" \
-e "/spark\.version/ s/1\.6\.1/2.0.0/g" \
-i .spark2.bak '{}' \;
-i.spark2.bak '{}' \;

0 comments on commit a0730f3

Please sign in to comment.