Author: Jonathan.Wage
Date: 2010-02-17 16:03:02 +0100 (Wed, 17 Feb 2010)
New Revision: 28081
Modified:
plugins/sfSympalPlugin/trunk/data/bin/installer.php
plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
Log:
[1.4][sfSympalPlugin][1.0] Installer fixes
Modified: plugins/sfSympalPlugin/trunk/data/bin/installer.php
===================================================================
--- plugins/sfSympalPlugin/trunk/data/bin/installer.php 2010-02-17 14:58:44 UTC
(rev 28080)
+++ plugins/sfSympalPlugin/trunk/data/bin/installer.php 2010-02-17 15:03:02 UTC
(rev 28081)
@@ -218,7 +218,6 @@
{
$this->logSection('i18n', 'enabling i18n in Sympal with cultures:
'.implode(', ', $cultures));
- $out = $err = null;
$command = sprintf(
'%s "%s" %s',
sfToolkit::getPhpCli(),
@@ -241,8 +240,16 @@
file_put_contents($settingsFilename, $settings);
}
+$command = sprintf(
+ '%s "%s" %s',
+ sfToolkit::getPhpCli(),
+ sfConfig::get('sf_root_dir').'/symfony',
+ 'sympal:enable-for-app '.$application
+);
+$this->logBlock($command, 'INFO');
+$this->getFilesystem()->execute($command);
+
// execute sympal installation
-$out = $err = null;
$command = sprintf(
'%s "%s" %s',
sfToolkit::getPhpCli(),
@@ -250,7 +257,7 @@
'sympal:install '.$application.' --force-reinstall
--email-address="'.$emailAddress.'" --username="'.$username.'"
--password="'.$password.'" --no-confirmation --db-dsn="'.$db['dsn'].'"
--db-username="'.$db['username'].'" --db-password="'.$db['password'].'"
--first-name="'.$firstName.'" --last-name="'.$lastName.'"'
);
$this->logBlock($command, 'INFO');
-$this->getFilesystem()->execute($command, $out, $err);
+$this->getFilesystem()->execute($command);
// fix permission for common directories
$fixPerms = new sfProjectPermissionsTask($this->dispatcher, $this->formatter);
Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
2010-02-17 14:58:44 UTC (rev 28080)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
2010-02-17 15:03:02 UTC (rev 28081)
@@ -66,6 +66,7 @@
{
$plugins[] = basename($path);
}
+ $plugins = array_unique($plugins);
sort($plugins);
$this->_configuration->setPlugins($plugins);
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
