From acd83f622aac6bf326b03f1828a5889cf95cac1a Mon Sep 17 00:00:00 2001 From: leedongmyung Date: Sun, 12 Nov 2023 21:35:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/oto/application.dart | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/lib/oto/application.dart b/lib/oto/application.dart index 02ef19f..9cbc424 100644 --- a/lib/oto/application.dart +++ b/lib/oto/application.dart @@ -1,7 +1,5 @@ import 'dart:async'; -import 'dart:convert'; import 'dart:io'; -import 'package:dart_framework/charset/euc_kr.dart'; import 'package:dart_framework/utils/system_util.dart'; import 'package:oto_cli/oto/command.dart'; import 'package:oto_cli/oto/data/data.dart'; @@ -53,17 +51,11 @@ class Application { ]).then((ProcessResult result) => jsonStr = result.stdout); jenkinsMap = getMapFromJson(jsonStr)!; } else if (Platform.isWindows) { - String? stdout; - String? stderr; await Process.run('cmd', [ '/C', '${Directory.current.path}/assets/script/batch/jenkins_env_params.bat' - ]).then((ProcessResult result) { - stdout = result.stdout; - stderr = result.stderr; - }); - List bytes = utf8.encode(stdout!); - jsonStr = eucKr.decode(bytes).replaceAll('\\', '/'); + ]).then((ProcessResult result) => jsonStr = result.stdout); + jsonStr = jsonStr.replaceAll('\\', '/'); jenkinsMap = getMapFromJson(jsonStr); } else { enable = false; @@ -120,14 +112,10 @@ class Application { var file = File('${_jenkinsData!.workspace}/build_data.conf'); var content = ''; if (Platform.isWindows) { - if (Platform.isWindows) { - var list = await file.readAsBytes(); - content = eucKr.decode(list); - } else { - content = file.readAsStringSync( - encoding: Platform.isWindows ? eucKr : SystemEncoding()); - } - content.replaceAll('BuildData=', '').replaceAll('\\', '/'); + content = file + .readAsStringSync(encoding: SystemEncoding()) + .replaceAll('BuildData=', '') + .replaceAll('\\', '/'); var regEx = RegExp(r'(%)([a-zA-Z0-9]+)(%)'); var list = regEx.allMatches(content); var params = [];