Skip to content

Commit

Permalink
Holy eff. it was a snippet issue.
Browse files Browse the repository at this point in the history
  • Loading branch information
patcon committed Nov 18, 2012
1 parent 437468c commit 2a60dc2
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,26 @@ DRUSH_URL="http://ftp.drupal.org/files/projects/drush-7.x-$DRUSH_VERSION.tar.gz"
echo "-----> Bundling Drush version $DRUSH_VERSION"
curl --silent --max-time 60 --location "$DRUSH_URL" | tar xz

# update config files
cp $LP_DIR/conf/httpd.conf $APACHE_PATH/conf
cp $LP_DIR/conf/php.ini php

# make php available on bin
mkdir -p bin
ln -s /app/php/bin/php bin/php

# Check if drupal install profile
if [ -f build-*.make ] && [ ! -d www ]; then
LD_LIBRARY_PATH=php/ext ./php/bin/php -f drush/drush.php make build-test.make www --php=php/bin/php
LD_LIBRARY_PATH=php/ext ./php/bin/php -f drush/drush.php site-install minimal --yes --php=php/bin/php --root=www
#cp www/sites/default/default.settings.php www/sites/default/settings.php
#echo "-----> Appending settings.php snippets..."
#for f in tmp/snippets/*.settings.php
#do
# # Concatenate newline and snippet, then append to settings.php
# echo "" | cat - $f | tee -a www/sites/default/settings.php > /dev/null
#done
cp www/sites/default/default.settings.php www/sites/default/settings.php
echo "-----> Appending settings.php snippets..."
for f in tmp/snippets/*.settings.php
do
# Concatenate newline and snippet, then append to settings.php
echo "" | cat - $f | tee -a www/sites/default/settings.php > /dev/null
done
fi

# update config files
cp $LP_DIR/conf/httpd.conf $APACHE_PATH/conf
cp $LP_DIR/conf/php.ini php

cat >>boot.sh <<EOF
for var in \`env|cut -f1 -d=\`; do
echo "PassEnv \$var" >> /app/apache/conf/httpd.conf;
Expand Down

0 comments on commit 2a60dc2

Please sign in to comment.