Further tuning

build/scripts/exportFiles.sh

@@ -10,5 +10,6 @@ mkdir -p "$1"
 
 OUTPUT_FILE="$1/files.tar.gz"
 /scripts/clearDrupalCache.sh > /dev/null 2>&1
-tar -cvpzf "$1/files.tar.gz" --exclude=*.css --exclude=*.css.gz --exclude=*.js --exclude=*.js.gz --exclude=app/html/sites/default/files/php --exclude=app/html/sites/default/files/styles /app/html/sites/default/files > /dev/null 2>&1
+cd "$DRUPAL_ROOT/sites/default/files"
+tar -cvpzf "$1/files.tar.gz" --exclude=*.css --exclude=*.css.gz --exclude=*.js --exclude=*.js.gz --exclude=./php --exclude=./styles . > /dev/null 2>&1
 echo "$OUTPUT_FILE"

build/scripts/importContent.sh

@@ -10,8 +10,8 @@ elif [ ! -f "$1" ] ; then
 fi
 
 # Import the content.
-gunzip $1
 EXTRACTED_FILE=$(echo $1 | rev | cut -f 2- -d '.' | rev)
+gunzip -c "$1" >/tmp/$EXTRACTED_FILE
 echo "Importing $EXTRACTED_FILE"
-sh -c "$DRUSH sql-cli < $EXTRACTED_FILE"
+sh -c "$DRUSH sql-cli < /tmp/$EXTRACTED_FILE"
 $DRUSH cr

build/scripts/importData.sh

@@ -13,6 +13,8 @@ fi
 /scripts/importContent.sh "$1/db.sql.gz"
 
 # (Optionally) Import Files.
-elif [ -f "$1/files.tar.gz" ] ; then
+if [ -f "$1/files.tar.gz" ] ; then
   /scripts/importFiles.sh "$1/files.tar.gz"
 fi
+
+Echo 'Success!'

build/scripts/importFiles.sh

@@ -13,6 +13,6 @@ fi
 # Import the filesystem archive to the public filesystem.
 tar -tzf $1 >/dev/null # Check if the archive is valid.
 rm -rf "$DRUPAL_ROOT/sites/default/files/*"
-tar -xzf $1 --directory /
+tar -xzf $1 --directory "$DRUPAL_ROOT/sites/default/files/"
 /scripts/pre-init.d/71_set_public_file_permissions.sh
 /scripts/pre-init.d/72_secure_filesystems.sh