wok diff nareto/receipt @ rev 20793
linld: fix strcatb
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Feb 14 18:37:56 2019 +0100 (2019-02-14) |
parents | 3765f181a6d5 |
children | 599ac1affa58 |
line diff
1.1 --- a/nareto/receipt Sat Nov 30 17:02:58 2013 +0000 1.2 +++ b/nareto/receipt Thu Feb 14 18:37:56 2019 +0100 1.3 @@ -86,12 +86,12 @@ 1.4 1.5 post_install() 1.6 { 1.7 - [ -s $1/usr/share/nagios/.htaccess ] && 1.8 - cp $1/usr/share/nagios/.htaccess $1/usr/share/nareto/ 1.9 + [ -s "$1/usr/share/nagios/.htaccess" ] && 1.10 + cp "$1/usr/share/nagios/.htaccess" "$1/usr/share/nareto/" 1.11 # Configure lighttpd server 1.12 - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then 1.13 - if ! grep -q /usr/share/nareto/ $1/etc/lighttpd/lighttpd.conf; then 1.14 - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/nareto/" => "/usr/share/nareto",|g' -i $1/etc/lighttpd/lighttpd.conf 1.15 + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then 1.16 + if ! grep -q /usr/share/nareto/ "$1/etc/lighttpd/lighttpd.conf"; then 1.17 + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/nareto/" => "/usr/share/nareto",|g' -i "$1/etc/lighttpd/lighttpd.conf" 1.18 if [ -z "$1" ]; then 1.19 # Start Web server. 1.20 /etc/init.d/lighttpd stop 1.21 @@ -101,10 +101,10 @@ 1.22 fi 1.23 1.24 # Configure apache server 1.25 - if [ -f $1/etc/apache/httpd.conf ]; then 1.26 - sed -i 's/lighttpd/apache/' $1/etc/rcS.conf 1.27 - if [ ! -f $1/etc/apache/conf.d/nareto ]; then 1.28 - cat > $1/etc/apache/conf.d/nareto <<EOT 1.29 + if [ -f "$1/etc/apache/httpd.conf" ]; then 1.30 + sed -i 's/lighttpd/apache/' "$1/etc/rcS.conf" 1.31 + if [ ! -f "$1/etc/apache/conf.d/nareto" ]; then 1.32 + cat > "$1/etc/apache/conf.d/nareto" <<EOT 1.33 Alias /nareto/ /usr/share/nareto/ 1.34 <Directory "/usr/share/nareto/"> 1.35 Options None