From 4c2c9d75d2ed4a6b07290eb430c413133ebff5e7 Mon Sep 17 00:00:00 2001
From: "Dr. Martin Goik" <goik@hdm-stuttgart.de>
Date: Tue, 19 Feb 2019 09:36:38 +0100
Subject: [PATCH] Cleaning up archive from .idea, *.iml and .class files
---
AuswertungKlausur/noten.sh | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/AuswertungKlausur/noten.sh b/AuswertungKlausur/noten.sh
index 71c91c6e1..15f4a4d77 100755
--- a/AuswertungKlausur/noten.sh
+++ b/AuswertungKlausur/noten.sh
@@ -17,14 +17,11 @@ TESTJAR=sd1_2017sommer_exam-0.9-fat-tests.jar
declare -a MARKERS=("Aufgabe 1" "Aufgabe 2")
-# No changes beyond this line
-#--------------------------------------------------------------------------------------------
-
mkdir -p Unpack
rm -rf ~/results.log /tmp/Reference
cp -r $PROJECTREF /tmp/Reference
pushd /tmp/Reference
- mvn eclipse:clean clean;
+ mvn -T4 clean;
rm -rf src/main/java
popd
@@ -33,31 +30,38 @@ for zip in $( ls *.zip); do
echo $fbname
mkdir Unpack;pushd Unpack
unzip ../$fbname.zip
- rm -rf RemoteSystemsTempFiles
- nodeCount=`ls|wc -l`
- dirCount=`ls -l|grep ^d|wc -l`
+ pomFileCount=`find . -name pom.xml|wc -l`
+ if [[ 1 = $pomFileCount ]]; then
+ projectDir=`find . -name pom.xml`
+ projectDir=${projectDir%/*}
+ echo "Found project $projectDir"
- if [[ 1 = $nodeCount && 1 = $dirCount ]]; then
- echo "Found exactly one directory component"
- mv * project
- if [ -f project/$SRCREPRESENT ]; then
- echo "found HandyAbrechnung.java"
+ if [ -f $projectDir/$SRCREPRESENT ]; then
+ echo "Found $projectDir/$SRCREPRESENT"
cp -r /tmp/Reference .
- mv project/src/main/java Reference/src/main
+ cp -r $projectDir/src/main/java Reference/src/main
pushd Reference
- mvn compile test-compile
+ mvn -T4 compile test-compile
if [ $? -eq 0 ] ; then
- mvn -Dmaven.test.skip=true package
+ mvn -T4 -Dmaven.test.skip=true package
result=""
for mark in "${MARKERS[@]}"; do
result+=`java -jar target/$TESTJAR | grep "$mark"|sed 's/^[ ]*//'`
result+=" "
done
else
- result="Project does not compile"
+ result="$projectDir does not compile"
fi
popd
echo "$fbname $result" >> ~/results.log
+
+ #Cleanup user project
+ pushd $projectDir
+ rm -rf *.iml .idea A1.log
+ mvn clean
+ popd
+ rm ../$fbname.zip
+ zip -r ../$fbname.zip $projectDir
else
echo "$fbname : $SRCREPRESENT not found" >> ~/results.log
fi
--
GitLab