X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=mkdist;h=ea4e7b3d6e2be3dd7eb2b134e7c8d70957a76044;hb=b042d04289388613b4ac4fd2f73f728092fb9403;hp=5e50278a7c09e73418669228acdd70361742f8f4;hpb=cf0028a726ccf608687a382fd94473b78daa760e;p=diplomky.git

diff --git a/mkdist b/mkdist
index 5e50278..ea4e7b3 100755
--- a/mkdist
+++ b/mkdist
@@ -3,9 +3,9 @@ set -e
 export LC_ALL=cs_CZ
 
 for a in bp dp phd ; do
-	rm -rf vzor-$a{,-win,-utf}
+	rm -rf vzor-$a{,-win,-iso}
 	git archive --prefix=vzor-$a/ HEAD | tar xf -
-	rm -rf vzor-$a/{mkdist,uprava,slides}
+	rm -rf vzor-$a/{mkdist,upload,uprava,slides,TODO}
 done
 
 # BP
@@ -58,22 +58,22 @@ done
 )
 
 for a in bp dp phd ; do
-	# Basic version
-	zip -r vzor-$a-iso.zip vzor-$a
+	# Basic version (UTF-8)
+	zip -r vzor-$a.zip vzor-$a
 
 	# CP1250 version
 	cp -a vzor-$a vzor-$a-win
 	for c in vzor-$a-win/{*/*.tex,README} ; do
-		recode iso-8859-2..windows-1250 $c
+		recode utf-8..windows-1250 $c
 	done
-	sed -i 's/\[latin2]/[cp1250]/g' vzor-$a-win/{cs/prace.tex,en/thesis.tex}
+	sed -i 's/\[utf8]/[cp1250]/g' vzor-$a-win/{cs/prace.tex,en/thesis.tex}
 	zip -r vzor-$a-win.zip vzor-$a-win
 
-	# UTF-8 version
-	cp -a vzor-$a vzor-$a-utf
-	for c in vzor-$a-utf/{*/*.tex,README} ; do
-		recode iso-8859-2..utf-8 $c
+	# ISO-8859-2 version
+	cp -a vzor-$a vzor-$a-iso
+	for c in vzor-$a-iso/{*/*.tex,README} ; do
+		recode utf-8..iso-8859-2 $c
 	done
-	sed -i 's/\[latin2]/[utf8]/g' vzor-$a-utf/{cs/prace.tex,en/thesis.tex}
-	zip -r vzor-$a-utf.zip vzor-$a-utf
+	sed -i 's/\[utf8]/[latin2]/g' vzor-$a-iso/{cs/prace.tex,en/thesis.tex}
+	zip -r vzor-$a-iso.zip vzor-$a-iso
 done