diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-09-02 19:39:23 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-09-02 19:39:23 (EDT) |
| commit | 4201b6f84e54a19b1d2e9c31ff44f32334ab0ced (patch) | |
| tree | 685b0ee8397a170cdddfe4b62a9c7a932e6e3177 | |
| parent | 1b84ff941776877dbd15a06fe3da22422ad3a0a0 (diff) | |
index, garbage: Use ${MD5SUM}, ${SHA256SUM}, ${GZIP}, and ${DATE}
| -rw-r--r-- | src/garbage.sh | 2 | ||||
| -rw-r--r-- | src/index.sh | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/garbage.sh b/src/garbage.sh index f7e96f7..58dab41 100644 --- a/src/garbage.sh +++ b/src/garbage.sh @@ -32,7 +32,7 @@ collect_garbage() # NB: The %s format conversion specifier is not specified by POSIX, but # it is supported by the GNU and BusyBox implementations of date. - cur_time=$(date '+%s') + cur_time=$("${DATE}" '+%s') for garbage in "${base_dir}/.db/garbage/"*; do if [ ! -f "${garbage}" ]; then diff --git a/src/index.sh b/src/index.sh index 5fad795..ea479d5 100644 --- a/src/index.sh +++ b/src/index.sh @@ -47,8 +47,8 @@ feed_add_package() tar -xzO './control' >"${feed_hash_idx}/info/${pkg}.control" printf 'Filename: %s\nSize: %s\nMD5sum: %s\nSHA256sum: %s\n\n' \ "../../../../../../${file}" "${size}" \ - "$(md5sum "${base_dir}/${file}" | sed 's/ .*$//')" \ - "$(sha256sum "${base_dir}/${file}" | sed 's/ .*$//')" \ + "$("${MD5SUM}" "${base_dir}/${file}" | sed 's/ .*$//')" \ + "$("${SHA256SUM}" "${base_dir}/${file}" | sed 's/ .*$//')" \ >>"${feed_hash_idx}/info/${pkg}.control" # Mark feed index fragment as outdated. @@ -166,7 +166,8 @@ update_feeds() mv "${sect}/Packages~" \ "${sect}/Packages" if ${conf_gzip}; then - gzip -9c "${sect}/Packages" \ + "${GZIP}" -9c \ + "${sect}/Packages" \ >"${sect}/Packages.gz" fi printf '%s\n' "${manifest_entry}" >&3 |