diff options
| -rwxr-xr-x | include/option.sh | 11 | ||||
| -rwxr-xr-x | script/roms | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/include/option.sh b/include/option.sh index b974c630..c42327d4 100755 --- a/include/option.sh +++ b/include/option.sh @@ -196,10 +196,15 @@ mktarball() tar -c "$1" | xz -T$threads -9e > "$2" || \ $err "mktarball 2, $1" fi + mksha512sum "${2}" "${2##*/}.sha512" +} + +mksha512sum() +{ ( - [ "${2%/*}" != "${2}" ] && x_ cd "${2%/*}" - sha512sum "${2##*/}" > "${2##*/}.sha512" || \ - $err "!sha512sum \"${2##*/}\" > \"${2##*/}.sha512\"" + [ "${1%/*}" != "${1}" ] && x_ cd "${1%/*}" + sha512sum ./"${1##*/}" >> "${2}" || \ + $err "!sha512sum \"${1}\" > \"${2}\"" ) || $err "failed to create tarball checksum" } diff --git a/script/roms b/script/roms index b48bb7a0..2908dc3a 100755 --- a/script/roms +++ b/script/roms @@ -472,10 +472,7 @@ moverom() x_ cp "$1" "$2" [ "$lbmk_release" = "y" ] || return 0 - ( - cd "${2%/*}" || $err "moverom, !cd \"${2%/*}\"" - sha512sum ./"${2##*/}" >> vendorhashes || $err "!$2 vendorhashes" - ) || $err "Cannot create checksum for '$2'" + mksha512sum "${2}" "vendorhashes" x_ ./vendor inject -r "${2}" -b "$board" -n nuke } |