diff --git a/sync/common_8 b/sync/common_8 index 0577166..a61d9f5 100644 --- a/sync/common_8 +++ b/sync/common_8 @@ -116,8 +116,8 @@ EOF function treeinfoModderKickstart() { BaseOSArch="${1}" - TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo" - PRISTINE_TREE="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo-pristine" + TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/kickstart/.treeinfo" + PRISTINE_TREE="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/kickstart/.treeinfo-pristine" test -f "${TREEINFO_VAR}" treeinfo_retval=$? test -x /usr/bin/python3 diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh index d1e25bf..fbc6a19 100644 --- a/sync/minor-release-sync-to-staging.sh +++ b/sync/minor-release-sync-to-staging.sh @@ -60,16 +60,16 @@ for ARCH in "${ARCHES[@]}"; do cp "${SOURCE}"/*.iso "${TARGET}/" cp "${SOURCE}"/*.iso.manifest "${TARGET}/" pushd "${TARGET}" || { echo "Could not change directory"; break; } - # shellcheck disable=SC2086 - for file in *.iso; do - printf "# %s: %s bytes\n%s\n" \ - "${file}" \ - "$(stat -c %s ${file})" \ - "$(sha256sum --tag ${file})" \ - | sudo tee -a CHECKSUM; - done - popd || { echo "Could not change directory"; break; } done + # shellcheck disable=SC2086 + for file in *.iso; do + printf "# %s: %s bytes\n%s\n" \ + "${file}" \ + "$(stat -c %s ${file})" \ + "$(sha256sum --tag ${file})" \ + | sudo tee -a CHECKSUM; + done + popd || { echo "Could not change directory"; break; } done # make a kickstart directory diff --git a/sync/sync-to-prod.sh b/sync/sync-to-prod.sh index fcb1faa..e14a49a 100644 --- a/sync/sync-to-prod.sh +++ b/sync/sync-to-prod.sh @@ -29,7 +29,8 @@ if [ $ret_val -eq "0" ]; then cd "${PRODUCTION_ROOT}/${CATEGORY_STUB}/" || { echo "Failed to change directory"; exit 1; } /bin/cp fullfiletimelist-rocky fullfiletimelist-rocky-old /usr/local/bin/create-filelist > fullfiletimelist-rocky + cp fullfiletimelist-rocky fullfiletimelist fi - chown 10004:10005 fullfilelist fullfiletimelist-rocky + chown 10004:10005 fullfilelist fullfiletimelist-rocky fullfiletimelist fi