diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-03-25 09:48:34 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:31 +0100 |
| commit | 5b24b5957668278f93c1e78f16e3982e92d3e516 (patch) | |
| tree | 5c43144cc3d8976519bf0444e124a0d608c57076 | |
| parent | 7aea3696cbc23096392c194bff1f851bc0e5aaac (diff) | |
| download | vyos-live-build-5b24b5957668278f93c1e78f16e3982e92d3e516.tar.gz vyos-live-build-5b24b5957668278f93c1e78f16e3982e92d3e516.zip | |
Fixing md5sum.txt creation to not fail on filenames with whitespaces, thanks to Bas Wijnen <wijnen@debian.org> (Closes: #469085).
| -rwxr-xr-x | helpers/lh_binary_md5sum | 4 | ||||
| -rwxr-xr-x | helpers/lh_source_md5sum | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum index 5ff1b2836..03c75d350 100755 --- a/helpers/lh_binary_md5sum +++ b/helpers/lh_binary_md5sum @@ -60,7 +60,7 @@ fi # Calculating md5sums cd binary -find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs -I{} md5sum "{}" > ../md5sum.txt +find . -type f \! -name 'isolinux/isolinux.bin' \! -name 'boot/grub/stage2_eltorito' -print0 | xargs -0 md5sum > ../md5sum.txt cat > md5sum.txt << EOF This file contains the list of md5 checksums of all files on this medium. @@ -71,7 +71,7 @@ or, manually with: 'md5sum -c md5sum.txt'. EOF -cat ../md5sum.txt >> md5sum.txt +sort ../md5sum.txt >> md5sum.txt rm -f ../md5sum.txt cd "${OLDPWD}" diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum index 00cbba445..ef9c0632b 100755 --- a/helpers/lh_source_md5sum +++ b/helpers/lh_source_md5sum @@ -65,7 +65,7 @@ fi # Calculating md5sums cd source -find . -type f | sort | xargs md5sum > ../md5sum.txt +find . -type f -print0 | xargs -0 md5sum > ../md5sum.txt cat > md5sum.txt << EOF This file contains the list of md5 checksums of all files on this medium. @@ -76,7 +76,7 @@ or, manually with: 'md5sum -c md5sum.txt'. EOF -cat ../md5sum.txt >> md5sum.txt +sort ../md5sum.txt >> md5sum.txt rm -f ../md5sum.txt cd "${OLDPWD}" |