diff options
| author |   Raul E Rangel <rrangel@chromium.org> | 2023-04-04 15:57:13 -0600 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-04-25 04:42:51 +0100 |
| commit | 158daca4d8dc373b5b6c5757cfa6491b6eda3b18 (patch) | |
| tree | 43dba5c829052f1decbe8a92a95f250205f28e1d | |
| parent | Honour ROOT when deleting existing catalog (diff) | |
| download | build-docbook-catalog-158daca4d8dc373b5b6c5757cfa6491b6eda3b18.tar.gz build-docbook-catalog-158daca4d8dc373b5b6c5757cfa6491b6eda3b18.tar.bz2 build-docbook-catalog-158daca4d8dc373b5b6c5757cfa6491b6eda3b18.zip | |
Fix incorrect cp when using ROOT
We were missing the ROOT prefix on the cp operation:
+ [[ -r /build/arm64-generic//etc/xml/catalog ]]
+ xmllint /build/arm64-generic//etc/xml/catalog
+ [[ ! -r /build/arm64-generic//etc/xml/catalog ]]
+ verb 'Found XML Catalog root /etc/xml/catalog'
+ false
+ verb ' Cleaning existing /etc/xml/docbook delegates from /etc/xml/catalog'
+ false
+ cp /etc/xml/catalog /etc/xml/catalog.tmp
+ clean_catalog file:///etc/xml/docbook /etc/xml/catalog.tmp
+ local list f regex=file:///etc/xml/docbook catalog=/build/arm64-generic//etc/xml/catalog.tmp
++ grep -E --only-matching file:///etc/xml/docbook /build/arm64-generic//etc/xml/catalog.tmp
++ sort -u
grep: /build/arm64-generic//etc/xml/catalog.tmp: No such file or directory
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Signed-off-by: Sam James <sam@gentoo.org>
| -rwxr-xr-x | build-docbook-catalog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-docbook-catalog b/build-docbook-catalog index cee9af0..2275703 100755 --- a/build-docbook-catalog +++ b/build-docbook-catalog @@ -187,7 +187,7 @@ create_catalogs() { verb "Found XML Catalog root ${ROOTCATALOG}" # clean out existing entries verb " Cleaning existing ${CATALOG} delegates from ${ROOTCATALOG}" - cp "${ROOTCATALOG}" "${ROOTCATALOG}.tmp" + cp "${ROOT}${ROOTCATALOG}" "${ROOT}${ROOTCATALOG}.tmp" clean_catalog "file://${CATALOG}" "${ROOTCATALOG}.tmp" fi |