diff --git a/bin/main.dart b/bin/main.dart index 735abb8..344c5b5 100644 --- a/bin/main.dart +++ b/bin/main.dart @@ -9,9 +9,7 @@ import 'package:oto_cli/cli/commands/command_exe.dart'; void main(List arguments) async { Application('oto', 'com.toki-labs.oto', () { - print(and); - - CLI.initialize('oto', arguments, + CLI.initialize(appName, arguments, [CommandTemplate(), CommandExe(), CommandScheduler()]); }, (error, stack) { print(error); diff --git a/lib/oto/core/data_composer.dart b/lib/oto/core/data_composer.dart index 7b83d6c..715160d 100644 --- a/lib/oto/core/data_composer.dart +++ b/lib/oto/core/data_composer.dart @@ -57,6 +57,7 @@ class DataComposerJenkins extends DataComposer { var process = await ProcessExecutor.start(shell, printStdout: false); await process.waitForExit(); buildYaml = process.stdout.toString(); + commonData = DataCommon.fromJson(jenkinsMap); } else if (Platform.isWindows) { await Process.run('cmd', [ '/C', @@ -65,6 +66,7 @@ class DataComposerJenkins extends DataComposer { jsonStr = jsonStr.substring(jsonStr.indexOf('{')); jsonStr = jsonStr.replaceAll('\\', '/'); jenkinsMap = getMapFromJson(jsonStr); + commonData = DataCommon.fromJson(jenkinsMap!); buildYaml = await getBuildData(); } else { enable = false; @@ -76,7 +78,6 @@ class DataComposerJenkins extends DataComposer { await printer('Jenkins Variables', Color.green); Application.log(jsonStr); } - commonData = DataCommon.fromJson(jenkinsMap!); return simpleFuture; }