From 787a189b5773928bfcb09173c4407475ea6b0219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= <anton@sijanec.eu>
Date: Wed, 6 Dec 2023 20:09:53 +0100
Subject: DN06 etc

---
 "\305\241ola/p1/dn/tj.sh" | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'šola/p1/dn/tj.sh')

diff --git "a/\305\241ola/p1/dn/tj.sh" "b/\305\241ola/p1/dn/tj.sh"
index 705db03..dcb1270 100755
--- "a/\305\241ola/p1/dn/tj.sh"
+++ "b/\305\241ola/p1/dn/tj.sh"
@@ -6,11 +6,17 @@ d=$3
 uspelih=0
 napa=0
 predolg=0
-for f in $2/*.in
+find $2 -name '*.java' -or -name '*.in' | while read -r f
 do
 	echo -n "$f ... "
 	uspeh=0
-	out=$(timeout 5s /usr/bin/time --quiet -f %E diff --ignore-trailing-space --side-by-side <(java $1 < $f) `sed s/in$/out/ <<<$f` 2>&1) && uspeh=1
+	if grep 'java$' <<<$f > /dev/null
+	then
+		stdout=`echo <(java $f)`
+	else
+		stdout=`echo <(java $1 < $f)`
+	fi
+	out=$(timeout 5s /usr/bin/time --quiet -f %E diff --ignore-trailing-space --side-by-side <(java `grep 'java$' <<<$f > /dev/null && echo $f || echo $1` <$f) `sed -e s/in$/out/ -e 's/Test\([0-9]\)/test\1/' -e s/java$/out/ <<<$f` 2>&1) && uspeh=1
 	koda=$?
 	if [ $uspeh -eq 0 ]
 	then
@@ -27,6 +33,7 @@ do
 			tac $f | tac
 			echo "IZHOD: Levo je vaš izhod, desno je pravilen izhod:"
 			head -n-1 <<<$out
+			grep 'java$' <<<$f > /dev/null && echo "PRIPOROČILO: Če DN zahteva razrede (kot recimo DN06), morate imeti v trenutnem direktoriju PREVEDENE .class datoteke vaših zahtevanih razredov. Če so v katerem drugem direktoriju, morate nastaviti CLASSPATH."
 		fi
 	else
 		uspelih=$(($uspelih+1))
-- 
cgit v1.2.3