Merge pull request civicrm#165 from mlutfy/6.x-4.4-crm15331

CRM-15331 [6.x-4.4] Backport for drush civicrm-install: check for the civicrm.settings.template file.

Author: dlobo

drush/civicrm.drush.inc

@@ -361,8 +361,19 @@ function _civicrm_generate_settings_file($dbuser, $dbpass, $dbhost, $dbname, $mo
   $siteRoot   = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);
   $crmPath    = "$modPath/civicrm";
 
-  $settingsTplFile = "$crmPath/templates/CRM/common/civicrm.settings.php.tpl";
-  if (!file_exists($settingsTplFile)) {
+  $files = array(
+    "$crmPath/templates/CRM/common/civicrm.settings.php.template",
+    "$crmPath/templates/CRM/common/civicrm.settings.php.tpl"
+  );
+
+  $settingsTplFile = NULL;
+  foreach ($files as $file) {
+    if (file_exists($file)) {
+      $settingsTplFile = $file;
+    }
+  }
+
+  if (!$settingsTplFile) {
     drush_die(dt("Could not find CiviCRM settings template and therefore could not create settings file."));
   }