From 87aab730582cb4268f50062361fec7f13e2b50ab Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 20 Jun 2022 22:09:24 +0200 Subject: [PATCH] Corrected sorting of /md5sum.txt by merge_debian_isos --- test/merge_debian_isos | 10 +++++++--- test/merge_debian_isos.sig | Bin 72 -> 72 bytes 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/merge_debian_isos b/test/merge_debian_isos index 7d942179..af940d80 100755 --- a/test/merge_debian_isos +++ b/test/merge_debian_isos @@ -2,6 +2,10 @@ # Copyright 2022 Thomas Schmitt , libburnia project. # Provided under BSD license: Use, modify, and distribute as you like. +# This obtrusive setting shall make the script safe against exotic locales. +export LANG=C +export LC_ALL=C + usage() { echo "usage: $(basename "$0") result_iso mount_template iso1 iso2 [... isoN]" >&2 echo >&2 @@ -619,7 +623,7 @@ echo "Merging package description files ..." >&2 for i in $MOUNT_LIST do cat "$i"/md5sum.txt -done | sort >merged_md5sum.txt +done | sort -k 2 >merged_md5sum.txt # Determine the files which are mentioned with checksum in main Release files path_list=$(for i in $MOUNT_LIST @@ -720,7 +724,8 @@ echo "Done." >&2 echo >&2 echo "Producing result ISO image ..." >&2 -# Create file with list of pool -map commands for all but the first ISO +# Create file with list of /pool and /firmware -map commands for all but the +# first ISO for mount_point in $MOUNT_LIST do if test "$mount_point" = "$mount_point_1" @@ -731,7 +736,6 @@ do echo " -map ${mount_point}/pool /pool" >>temp_file fi done - for mount_point in $MOUNT_LIST do if test "$mount_point" = "$mount_point_1" diff --git a/test/merge_debian_isos.sig b/test/merge_debian_isos.sig index 219de15f3098d5a31f2f344090e4834881a4ecea..32148eed45ede5c645b2a0a415d4110b4c71c327 100644 GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0%EY!v;YbT5b4X`z^lNhR51+zpt=}cj96h}&#{T*NNc$} eB}m6_(g2@xb$qZX{k#d3Rx&aGk9KNAXVLH4R2}R9 literal 72 zcmV-O0Jr~$Mg#y60ssaD0%EQkdH@Ou5b4X`z^lNhROJ5voe^G;%c#S$Ic< eLd&N(Zvdc`8F^1ssgFhH>+U7Cve!C%WDYI+rXM~4