build_torcx_store: upload to 'pkgs'

This is consistent with the local directory hierarchy
This commit is contained in:
Euan Kemp 2017-09-06 16:22:39 -07:00
parent d3867403ed
commit 1989ff96d8

View File

@ -202,7 +202,7 @@ function torcx_package() {
pkg_locations+=("/usr/share/torcx/store/${name}:${version}.torcx.tgz") pkg_locations+=("/usr/share/torcx/store/${name}:${version}.torcx.tgz")
fi fi
if [[ "${FLAGS_upload}" -eq ${FLAGS_TRUE} ]]; then if [[ "${FLAGS_upload}" -eq ${FLAGS_TRUE} ]]; then
pkg_locations+=("$(download_tectonic_torcx_url "pkg/${BOARD}/${name}/${digest}/${name}:${version}.torcx.tgz")") pkg_locations+=("$(download_tectonic_torcx_url "pkgs/${BOARD}/${name}/${digest}/${name}:${version}.torcx.tgz")")
fi fi
torcx_manifest::add_pkg "${manifest_path}" \ torcx_manifest::add_pkg "${manifest_path}" \
"${name}" \ "${name}" \
@ -244,7 +244,7 @@ for pkg in $(torcx_manifest::get_pkg_names "${manifest_path}"); do
# no need to sign; the manifest includes their shasum and is signed. # no need to sign; the manifest includes their shasum and is signed.
upload_files \ upload_files \
'torcx pkg' \ 'torcx pkg' \
"${TORCX_UPLOAD_ROOT}/pkg/${BOARD}/${pkg}/${digest}" \ "${TORCX_UPLOAD_ROOT}/pkgs/${BOARD}/${pkg}/${digest}" \
"" \ "" \
"${TORCX_CAS_ROOT}/${pkg}/${digest}"/*.torcx.tgz "${TORCX_CAS_ROOT}/${pkg}/${digest}"/*.torcx.tgz
done done