Merge pull request #3553 from VojtechVitek/drush_settings

Merged by openshift-bot
openshift · Sep 5, 2013 · 24f388f · 24f388f
2 parents 1112444 + d25ef23
commit 24f388f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/cartridges/openshift-origin-cartridge-php/bin/install b/cartridges/openshift-origin-cartridge-php/bin/install
@@ -12,6 +12,9 @@ rm -f $OPENSHIFT_PHP_DIR/modules $OPENSHIFT_PHP_DIR/conf/magic
 ln -s /usr/lib64/httpd/modules $OPENSHIFT_PHP_DIR/modules
 ln -s /etc/httpd/conf/magic $OPENSHIFT_PHP_DIR/conf/magic
 
+# Create a writable directory for Drush settings
+mkdir -p $OPENSHIFT_HOMEDIR/.drush
+
 # Pear setup
 rm -f $OPENSHIFT_HOMEDIR/.pearrc
 pear config-create "$OPENSHIFT_PHP_DIR"/phplib/pear/ "$OPENSHIFT_HOMEDIR"/.pearrc

diff --git a/cartridges/openshift-origin-cartridge-php/bin/upgrade b/cartridges/openshift-origin-cartridge-php/bin/upgrade
@@ -7,3 +7,7 @@ next=$3
 if [[ $curr =~ 0.0.[1-3] ]]; then
   pear -c "$OPENSHIFT_HOMEDIR"/.pearrc config-get bin_dir > "$OPENSHIFT_PHP_DIR/env/OPENSHIFT_PHP_PATH_ELEMENT"
 fi
+
+if [[ $curr =~ 0.0.4 ]]; then
+  mkdir -p $OPENSHIFT_HOMEDIR/.drush
+fi
diff --git a/cartridges/openshift-origin-cartridge-php/metadata/managed_files.yml b/cartridges/openshift-origin-cartridge-php/metadata/managed_files.yml
@@ -1,6 +1,7 @@
 ---
 locked_files:
 - ~/.pearrc
+- ~/.drush/
 - bin/
 - bin/*
 - configuration/