vbatts/containers-bsi
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

awk: don't print the newline. Removes the need for a tr

Browse source 
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Vincent Batts 2019-09-05 07:15:14 -04:00
parent 0d103e778f
commit b7e49bc1c6
Signed by: vbatts
GPG key ID: 10937E57733F1362
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BuildSourceImage.sh
View file

@ -345,7 +345,7 @@ layout_new() {
} }
} }
' '
local config_sum=$(echo "${config}" | jq -c | tr -d '\n' | sha256sum | awk '{ print $1 }' | tr -d '\n') local config_sum=$(echo "${config}" | jq -c | tr -d '\n' | sha256sum | awk '{ ORS=""; print $1 }')
echo "${config}" | jq -c | tr -d '\n' > "${out_dir}/blobs/sha256/${config_sum}" echo "${config}" | jq -c | tr -d '\n' > "${out_dir}/blobs/sha256/${config_sum}"
local mnfst=' local mnfst='
@ -359,7 +359,7 @@ layout_new() {
"layers": [] "layers": []
} }
' '
local mnfst_sum=$(echo "${mnfst}" | jq -c | tr -d '\n' | sha256sum | awk '{ print $1 }' | tr -d '\n') local mnfst_sum=$(echo "${mnfst}" | jq -c | tr -d '\n' | sha256sum | awk '{ ORS=""; print $1 }')
echo "${mnfst}" | jq -c | tr -d '\n' > "${out_dir}/blobs/sha256/${mnfst_sum}" echo "${mnfst}" | jq -c | tr -d '\n' > "${out_dir}/blobs/sha256/${mnfst_sum}"
echo ' echo '
@ -427,7 +427,7 @@ layout_insert() {
_rm_rf "${tmpdir}" _rm_rf "${tmpdir}"
# checksum tar and move to blobs/sha256/$checksum # checksum tar and move to blobs/sha256/$checksum
local tmptar_sum="$(sha256sum ${tmptar} | awk '{ print $1 }')" local tmptar_sum="$(sha256sum ${tmptar} | awk '{ ORS=""; print $1 }')"
local tmptar_size="$(_size ${tmptar})" local tmptar_size="$(_size ${tmptar})"
mv "${tmptar}" "${out_dir}/blobs/sha256/${tmptar_sum}" mv "${tmptar}" "${out_dir}/blobs/sha256/${tmptar_sum}"
@ -455,7 +455,7 @@ layout_insert() {
_rm_rf "${out_dir}/blobs/${config_sum/:/\/}" _rm_rf "${out_dir}/blobs/${config_sum/:/\/}"
# rename the config blob to its new checksum # rename the config blob to its new checksum
local tmpconfig_sum="$(sha256sum ${tmpconfig} | awk '{ print $1 }')" local tmpconfig_sum="$(sha256sum ${tmpconfig} | awk '{ ORS=""; print $1 }')"
local tmpconfig_size="$(_size ${tmpconfig})" local tmpconfig_size="$(_size ${tmpconfig})"
mv "${tmpconfig}" "${out_dir}/blobs/sha256/${tmpconfig_sum}" mv "${tmpconfig}" "${out_dir}/blobs/sha256/${tmpconfig_sum}"
@ -487,7 +487,7 @@ layout_insert() {
_rm_rf "${mnfst}" _rm_rf "${mnfst}"
# rename the manifest blob to its new checksum # rename the manifest blob to its new checksum
local tmpmnfst_sum="$(sha256sum ${tmpmnfst} | awk '{ print $1 }')" local tmpmnfst_sum="$(sha256sum ${tmpmnfst} | awk '{ ORS=""; print $1 }')"
local tmpmnfst_size="$(_size ${tmpmnfst})" local tmpmnfst_size="$(_size ${tmpmnfst})"
mv "${tmpmnfst}" "${out_dir}/blobs/sha256/${tmpmnfst_sum}" mv "${tmpmnfst}" "${out_dir}/blobs/sha256/${tmpmnfst_sum}"