Skip to content

Commit 6952ca7

Browse files
ctruedenctrueden
committed
melting-pot: align append redirects to same file
We could use a heredoc... but I resist! It's fine the way it is! <_<
1 parent 6451dc3 commit 6952ca7

1 file changed

Lines changed: 45 additions & 44 deletions

File tree

‎melting-pot.sh‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -568,76 +568,77 @@ isProject() {
568568

569569
# Generates an aggregator POM for all modules in the current directory.
570570
generatePOM() {
571-
echo '<?xml version="1.0" encoding="UTF-8"?>' > pom.xml
572-
echo '<project xmlns="http://maven.apache.org/POM/4.0.0"' >> pom.xml
573-
echo ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' >> pom.xml
574-
echo ' xsi:schemaLocation="http://maven.apache.org/POM/4.0.0' >> pom.xml
575-
echo ' https://maven.apache.org/xsd/maven-4.0.0.xsd">' >> pom.xml
576-
echo ' <modelVersion>4.0.0</modelVersion>' >> pom.xml
577-
echo >> pom.xml
578-
echo ' <groupId>melting-pot</groupId>' >> pom.xml
579-
echo ' <artifactId>melting-pot</artifactId>' >> pom.xml
580-
echo ' <version>0.0.0-SNAPSHOT</version>' >> pom.xml
581-
echo ' <packaging>pom</packaging>' >> pom.xml
582-
echo >> pom.xml
583-
echo ' <name>Melting Pot</name>' >> pom.xml
584-
echo >> pom.xml
585-
echo ' <modules>' >> pom.xml
571+
echo '<?xml version="1.0" encoding="UTF-8"?>' > pom.xml
572+
echo '<project xmlns="http://maven.apache.org/POM/4.0.0"' >> pom.xml
573+
echo ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' >> pom.xml
574+
echo ' xsi:schemaLocation="http://maven.apache.org/POM/4.0.0' >> pom.xml
575+
echo ' https://maven.apache.org/xsd/maven-4.0.0.xsd">' >> pom.xml
576+
echo ' <modelVersion>4.0.0</modelVersion>' >> pom.xml
577+
echo >> pom.xml
578+
echo ' <groupId>melting-pot</groupId>' >> pom.xml
579+
echo ' <artifactId>melting-pot</artifactId>' >> pom.xml
580+
echo ' <version>0.0.0-SNAPSHOT</version>' >> pom.xml
581+
echo ' <packaging>pom</packaging>' >> pom.xml
582+
echo >> pom.xml
583+
echo ' <name>Melting Pot</name>' >> pom.xml
584+
echo >> pom.xml
585+
echo ' <modules>' >> pom.xml
586586
local dir
587587
for dir in */*
588588
do
589589
if [ "$(isProject "$dir")" ]
590590
then
591-
echo " <module>$dir</module>" >> pom.xml
591+
echo " <module>$dir</module>" >> pom.xml
592592
else
593593
# Check for a child component of a multi-module project.
594594
local childDir="$dir/$(basename "$dir")"
595595
test "$(isProject "$childDir")" &&
596-
echo " <module>$childDir</module>" >> pom.xml
596+
echo " <module>$childDir</module>" >> pom.xml
597597
fi
598598
done
599-
echo ' </modules>' >> pom.xml
600-
echo '</project>' >> pom.xml
599+
echo ' </modules>' >> pom.xml
600+
echo '</project>' >> pom.xml
601601
}
602602

603603
# Generates melt.sh script for all modules in the current directory.
604604
generateScript() {
605-
echo '#!/bin/sh' > melt.sh
606-
echo 'trap "exit" INT' >> melt.sh
607-
echo 'echo "Melting the pot..."' >> melt.sh
608-
echo 'dir=$(pwd)' >> melt.sh
609-
echo 'failCount=0' >> melt.sh
610-
echo 'for f in \' >> melt.sh
605+
echo '#!/bin/sh' > melt.sh
606+
echo 'trap "exit" INT' >> melt.sh
607+
echo 'echo "Melting the pot..."' >> melt.sh
608+
echo 'dir=$(pwd)' >> melt.sh
609+
echo 'failCount=0' >> melt.sh
610+
echo 'for f in \' >> melt.sh
611611
local dir
612612
for dir in */*
613613
do
614614
if [ "$(isProject "$dir")" ]
615615
then
616-
echo " $dir \\" >> melt.sh
616+
echo " $dir \\" >> melt.sh
617617
else
618618
# Check for a child component of a multi-module project.
619619
local childDir="$dir/$(basename "$dir")"
620620
test "$(isProject "$childDir")" &&
621-
echo " $childDir \\" >> melt.sh
621+
echo " $childDir \\" >> melt.sh
622622
fi
623623
done
624-
echo >> melt.sh
625-
echo 'do' >> melt.sh
626-
echo ' # If the build passed previously, don'\''t repeat it.' >> melt.sh
627-
echo ' test -f "$f/build.log" &&' >> melt.sh
628-
echo ' tail -n6 "$f/build.log" | grep -qF '\''[INFO] BUILD SUCCESS'\'' &&' >> melt.sh
629-
echo ' echo "[SKIPPED] $f (already succeeded)" && continue' >> melt.sh
630-
echo >> melt.sh
631-
echo ' cd "$f"' >> melt.sh
632-
echo ' sh "$dir/build.sh" >build.log 2>&1 &&' >> melt.sh
633-
echo ' echo "[SUCCESS] $f" || {' >> melt.sh
634-
echo ' echo "[FAILURE] $f"' >> melt.sh
635-
echo ' failCount=$((failCount+1))' >> melt.sh
636-
echo ' }' >> melt.sh
637-
echo ' cd - >/dev/null' >> melt.sh
638-
echo 'done' >> melt.sh
639-
echo 'test "$failCount" -gt 255 && failCount=255' >> melt.sh
640-
echo 'exit "$failCount"' >> melt.sh
624+
echo >> melt.sh
625+
echo 'do' >> melt.sh
626+
echo ' # If the build passed previously, don'\''t repeat it.' >> melt.sh
627+
echo ' test -f "$f/build.log" &&' >> melt.sh
628+
echo ' tail -n6 "$f/build.log" |' >> melt.sh
629+
echo ' grep -qF '\''[INFO] BUILD SUCCESS'\'' &&' >> melt.sh
630+
echo ' echo "[SKIPPED] $f (already succeeded)" && continue' >> melt.sh
631+
echo >> melt.sh
632+
echo ' cd "$f"' >> melt.sh
633+
echo ' sh "$dir/build.sh" >build.log 2>&1 &&' >> melt.sh
634+
echo ' echo "[SUCCESS] $f" || {' >> melt.sh
635+
echo ' echo "[FAILURE] $f"' >> melt.sh
636+
echo ' failCount=$((failCount+1))' >> melt.sh
637+
echo ' }' >> melt.sh
638+
echo ' cd - >/dev/null' >> melt.sh
639+
echo 'done' >> melt.sh
640+
echo 'test "$failCount" -gt 255 && failCount=255' >> melt.sh
641+
echo 'exit "$failCount"' >> melt.sh
641642
}
642643

643644
# Creates and tests an appropriate multi-module reactor for the given project.

0 commit comments

Comments
 (0)