From 0af339ea430a12919de8b3dd99eb17747c53e8e8 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Mon, 22 Oct 2012 15:28:35 -0700 Subject: [PATCH] rc5 --- CHANGELOG.txt | 3 +++ INSTALL.txt | 2 +- modules/drush/files/kala.drush.inc | 13 +++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 19f47ba..572cbc8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,9 @@ Changelog ====================== +Version 1.0-rc5 +- Fixed NUCLEAR drush crush bug + Version 1.0-rc4 - Fixed image cache files not generating diff --git a/INSTALL.txt b/INSTALL.txt index 137b458..fe8d272 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -42,7 +42,7 @@ http://www.ubuntu.com/download/server. Premade Install =============== If you wish to install our pre made Kalabox you can download that at. -http://files.kalamuna.com/kalabox1rc4.tar.gz +http://files.kalamuna.com/kalabox1rc5.tar.gz Import your Box ================ diff --git a/modules/drush/files/kala.drush.inc b/modules/drush/files/kala.drush.inc index 4ef4c5d..c948af3 100644 --- a/modules/drush/files/kala.drush.inc +++ b/modules/drush/files/kala.drush.inc @@ -157,7 +157,7 @@ function kala_vhost(){ $site = $pantheon['site']; - if ($pantheon != FALSE) { + if ($pantheon !== FALSE) { if (!file_exists("/etc/nginx/sites-available/" . $site)) { if (is_dir("/var/www/" . $site)) { drush_shell_exec("cp /etc/nginx/sites-available/drupaldefault /tmp/" . $site); @@ -226,7 +226,7 @@ function kala_code(){ $args = func_get_args(); $pantheon = _kala_get_pantheon($args[0]); - if ($pantheon != FALSE) { + if ($pantheon !== FALSE) { drush_print_table(drush_key_value_to_array_table($pantheon)); drush_log('pantheon environment and database variables loaded', 'success'); @@ -276,7 +276,7 @@ function kala_data(){ $pantheon = _kala_get_pantheon($args[0]); $pantheon['kaladb'] = str_replace("-", "_", $pantheon['site'] . "_kala"); - if ($pantheon != FALSE) { + if ($pantheon !== FALSE) { drush_print_table(drush_key_value_to_array_table($pantheon)); drush_log('pantheon environment and database variables loaded', 'success'); @@ -318,7 +318,7 @@ function kala_files(){ $args = func_get_args(); $pantheon = _kala_get_pantheon($args[0]); - if ($pantheon != FALSE) { + if ($pantheon !== FALSE) { drush_print_table(drush_key_value_to_array_table($pantheon)); drush_log('pantheon environment and database variables loaded', 'success'); @@ -350,7 +350,7 @@ function kala_build(){ $args = func_get_args(); $pantheon = _kala_get_pantheon($args[0]); - if ($pantheon != FALSE) { + if ($pantheon !== FALSE) { drush_print('preparing to build your pantheon site... this might take awhile'); @@ -385,7 +385,7 @@ function kala_destroy(){ $pantheon = _kala_get_pantheon($args[0]); $pantheon['kaladb'] = str_replace("-", "_", $pantheon['site'] . "_kala"); - if (isset($pantheon)) { + if ($pantheon !== FALSE) { drush_print('preparing to crush your pantheon site... this might take awhile'); @@ -520,6 +520,7 @@ function _kala_get_pantheon($sitename) { } else { drush_log('pantheon alias does not exist, please make sure you have a recent copy of all your aliases', 'error'); + return FALSE; } }