X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=914101e14e7d6b0bf89acb3c314755b04eeacbc9;hb=3ca575c5d44de0214b54c63eb99ca0cbd8bbd13c;hp=545d040bdc96a2a90f1bb33f3d489abc9dc1cb60;hpb=c751f72dce8c22f8b360508252d5328597dc5054;p=myplc.git

diff --git a/build.sh b/build.sh
index 545d040..914101e 100755
--- a/build.sh
+++ b/build.sh
@@ -85,6 +85,7 @@ datadirs=(
 /var/www/html/alpina-logs
 /var/www/html/boot
 /var/www/html/download
+/var/www/html/files
 /var/www/html/generated
 /var/www/html/install-rpms
 /var/www/html/xml
@@ -95,8 +96,10 @@ datadirs=(
 )
 for datadir in "${datadirs[@]}" ; do
     # If we are being re-run, it may be a symlink
-    rm -f root/$datadir || :
-    mkdir -p root/$datadir
+    if [ -h root/$datadir ] ; then
+	rm -f root/$datadir
+	mkdir -p root/$datadir
+    fi
 done
 
 echo "* myplc: Installing base filesystem"
@@ -131,12 +134,8 @@ install -m 755 \
 # Install web pages
 echo "* myplc: Installing web pages"
 mkdir -p root/var/www/html
-# Exclude old cruft, unrelated GENI pages, and official documents
 rsync -a $srcdir/new_plc_www/ root/var/www/html/
 
-# Make the Drupal files upload directory owned by Apache
-chown apache:apache root/var/www/html/files
-
 # Install Drupal rewrite rules
 install -D -m 644 $srcdir/new_plc_www/drupal.conf root/etc/httpd/conf.d/drupal.conf