wok diff docbook-xsl-ns/receipt @ rev 18730
Quote root dir in post_install
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Dec 20 15:13:45 2015 +0100 (2015-12-20) |
parents | eb8067417980 |
children | d6ca18366f41 |
line diff
1.1 --- a/docbook-xsl-ns/receipt Sat Nov 30 10:06:29 2013 +0000 1.2 +++ b/docbook-xsl-ns/receipt Sun Dec 20 15:13:45 2015 +0100 1.3 @@ -40,32 +40,39 @@ 1.4 post_install() 1.5 { 1.6 echo -n "Processing post-install commands..." 1.7 + if [ "$1" ]; then 1.8 + mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2> /dev/null 1.9 + cp /etc/resolv.conf "$1/etc/resolv.conf" 1.10 + fi 1.11 1.12 # Create a /etc/xml/catalog file 1.13 - if [ ! -d $1/etc/xml ]; then install -v -m755 -d $1/etc/xml; fi && 1.14 - if [ ! -f $1/etc/xml/catalog ]; then 1.15 - xmlcatalog --noout --create $1/etc/xml/catalog 1.16 + if [ ! -d "$1/etc/xml" ]; then install -v -m755 -d "$1/etc/xml"; fi && 1.17 + if [ ! -f "$1/etc/xml/catalog" ]; then 1.18 + chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog 1.19 fi && 1.20 1.21 - xmlcatalog --noout --add "rewriteSystem" \ 1.22 + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ 1.23 "http://docbook.sourceforge.net/release/xsl-ns/$VERSION" \ 1.24 "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ 1.25 - $1/etc/xml/catalog && 1.26 + /etc/xml/catalog && 1.27 1.28 - xmlcatalog --noout --add "rewriteURI" \ 1.29 + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ 1.30 "http://docbook.sourceforge.net/release/xsl-ns/$VERSION" \ 1.31 "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ 1.32 - $1/etc/xml/catalog && 1.33 + /etc/xml/catalog && 1.34 1.35 - xmlcatalog --noout --add "rewriteSystem" \ 1.36 + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ 1.37 "http://docbook.sourceforge.net/release/xsl-ns/current" \ 1.38 "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ 1.39 - $1/etc/xml/catalog && 1.40 + /etc/xml/catalog && 1.41 1.42 - xmlcatalog --noout --add "rewriteURI" \ 1.43 + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ 1.44 "http://docbook.sourceforge.net/release/xsl-ns/current" \ 1.45 "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ 1.46 - $1/etc/xml/catalog 1.47 + /etc/xml/catalog 1.48 status 1.49 + if [ "$1" ]; then 1.50 + mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2> /dev/null 1.51 + fi 1.52 } 1.53