mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Rename OrchardCommand to CommandName attribute
Also workaround issue with commands registered twice --HG-- branch : dev rename : src/Orchard/Commands/OrchardCommandAttribute.cs => src/Orchard/Commands/CommandNameAttribute.cs
This commit is contained in:
@@ -19,14 +19,16 @@ namespace Orchard.Host {
|
||||
//TODO
|
||||
}
|
||||
|
||||
public void RunCommand(OrchardParameters args) {
|
||||
public int RunCommand(OrchardParameters args) {
|
||||
var agent = Activator.CreateInstance("Orchard.Framework", "Orchard.Commands.CommandHostAgent").Unwrap();
|
||||
agent.GetType().GetMethod("RunSingleCommand").Invoke(agent, new object[] {
|
||||
int result = (int)agent.GetType().GetMethod("RunSingleCommand").Invoke(agent, new object[] {
|
||||
Console.In,
|
||||
Console.Out,
|
||||
args.Tenant,
|
||||
args.Arguments.ToArray(),
|
||||
args.Switches});
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -18,11 +18,11 @@ namespace Orchard {
|
||||
_args = args;
|
||||
}
|
||||
|
||||
static void Main(string[] args) {
|
||||
new Program(args).Run();
|
||||
static int Main(string[] args) {
|
||||
return new Program(args).Run();
|
||||
}
|
||||
|
||||
public void Run() {
|
||||
public int Run() {
|
||||
// Parse command line arguments
|
||||
var arguments = new OrchardParametersParser().Parse(new CommandParametersParser().Parse(_args));
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace Orchard {
|
||||
if (arguments.Verbose) {
|
||||
Console.WriteLine("Executing command in ASP.NET AppDomain");
|
||||
}
|
||||
host.RunCommand(arguments);
|
||||
return host.RunCommand(arguments);
|
||||
}
|
||||
|
||||
private DirectoryInfo GetOrchardDirectory(string directory) {
|
||||
|
||||
Reference in New Issue
Block a user