william/blog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

image_build: Fix. I don't know how this even worked before, it really should not have.

Browse source
This commit is contained in:
William Floyd 2020-07-05 00:21:32 -04:00
parent d2b6df03a5
commit bc87f6d7e2
Signed by untrusted user who does not match committer: william
GPG key ID: B3EEEDD81893CAF9
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/images_build.sh
View file

@ -354,6 +354,7 @@ __process_scripts() {
export FILE_HASH="$( export FILE_HASH="$(
{ {
md5sum "${__source_file}" md5sum "${__source_file}"
"${__source_file}" -d
"${__source_file}" -d | sort | while read -r __file; do "${__source_file}" -d | sort | while read -r __file; do
md5sum "${__file}" md5sum "${__file}"
done done
@ -402,22 +403,24 @@ __get_hash_file() {
__check_file() { __check_file() {
__hash_file="$(__get_hash_file "${1}")" __source="${1}"
shift shift
__hash_file="$(__get_hash_file "${__source}")"
__targets='' __targets=''
if [ "${#}" == '0' ]; then if [ "${#}" == '0' ]; then
__targets="$(sed 's|^\./src/|./|' <<<"${1}")" __targets="$(sed 's|^\./src/|./|' <<<"${__source}")"
else else
until [ "${#}" == '0' ]; do until [ "${#}" == '0' ]; do
__targets="${__target} __targets="${1}
${1}" ${__targets}"
shift shift
@ -431,7 +434,7 @@ ${1}"
return 1 return 1
fi fi
done done < <(sed '/^$/d' <<< "${__targets}")
if [ -e "${__hash_file}" ]; then if [ -e "${__hash_file}" ]; then
__file_hash="$(cat "${__hash_file}")" __file_hash="$(cat "${__hash_file}")"