v7.5.1

### 更新点
- `System.execBatchScript` の標準エラーが正しく取得できていなかった問題を修正

HISTORY.md

@@ -1,5 +1,9 @@
 # History
 
+## SenkoWSH v7.5.1
+### 更新点
+- `System.execBatchScript` の標準エラーが正しく取得できていなかった問題を修正
+
 ## SenkoWSH v7.5.0
 ### 更新点
 - `System.execBatchScript` の実行結果を単純な文字列から、より詳細なデータ `SystemExecResult` で返すように変更

docs/class/src/senko/System.js~System.html

@@ -1148,7 +1148,7 @@ <h3 data-ice="anchor" id="static-method-callWindowsAPI">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber486">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber488">source</a></span></span>
     </span>
   </h3>
 
@@ -1241,7 +1241,7 @@ <h3 data-ice="anchor" id="static-method-createByteArrayFromNumberArray">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber644">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber646">source</a></span></span>
     </span>
   </h3>
 
@@ -1324,7 +1324,7 @@ <h3 data-ice="anchor" id="static-method-createMSXMLDOMDocument">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber585">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber587">source</a></span></span>
     </span>
   </h3>
 
@@ -1383,7 +1383,7 @@ <h3 data-ice="anchor" id="static-method-createNumberArrayFromByteArray">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber610">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber612">source</a></span></span>
     </span>
   </h3>
 
@@ -1458,7 +1458,7 @@ <h3 data-ice="anchor" id="static-method-createXMLHttpRequest">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber544">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber546">source</a></span></span>
     </span>
   </h3>
 
@@ -1734,7 +1734,7 @@ <h3 data-ice="anchor" id="static-method-execPowerShell">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber445">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber447">source</a></span></span>
     </span>
   </h3>
 
@@ -2032,7 +2032,7 @@ <h3 data-ice="anchor" id="static-method-getClipBoardText">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber514">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber516">source</a></span></span>
     </span>
   </h3>
 
@@ -2389,7 +2389,7 @@ <h3 data-ice="anchor" id="static-method-isNativeCode">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber710">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber712">source</a></span></span>
     </span>
   </h3>
 
@@ -2802,7 +2802,7 @@ <h3 data-ice="anchor" id="static-method-setClipBoardText">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber527">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber529">source</a></span></span>
     </span>
   </h3>
 
@@ -3027,7 +3027,7 @@ <h3 data-ice="anchor" id="static-method-typeOf">
     <span class="right-info">
 
 
-      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber690">source</a></span></span>
+      <span data-ice="source"><span><a href="file/src/senko/System.js.html#lineNumber692">source</a></span></span>
     </span>
   </h3>
 

docs/file/src/senko/System.js.html

@@ -468,7 +468,8 @@
 		// UTF-8 や Shift_JIS は直接実行できないので chcp 用のスクリプトを挟ませる
 		const temp_starter = new SFile(temp_folder.getAbsolutePath() + "//" + "start.bat");
 		const temp_script  = new SFile(temp_folder.getAbsolutePath() + "//" + "script.bat");
-		const output_txt  = new SFile(temp_folder.getAbsolutePath() + "//" + "output.txt");
+		const output_std_txt  = new SFile(temp_folder.getAbsolutePath() + "//" + "output_std.txt");
+		const output_err_txt  = new SFile(temp_folder.getAbsolutePath() + "//" + "output_err.txt");
 
 		/**
 		 * chcp 変更用のスクリプト
@@ -477,7 +478,7 @@
 		const starter_scrpt = [];
 		starter_scrpt.push("chcp " + chcp);
 		starter_scrpt.push("@echo off");
-		starter_scrpt.push("call \"" + temp_script + "\" > \"" + output_txt + "\"");
+		starter_scrpt.push("call \"" + temp_script + "\" 1> \"" + output_std_txt + "\" 2> \"" + output_err_txt + "\"");
 		starter_scrpt.push("");
 
 		// 途中から文字コードが変わることを想定するため BOM を付けない
@@ -490,15 +491,16 @@
 		const command = cmd_base + " \"" + temp_starter + "\"";
 
 		// 実行
-		const ret = System.run(command, System.AppWinStype.Hide, true);
-		const text = output_txt.isFile() ? (output_txt.readString(icharset).replace(/\r?\n$/, "")) : "";
+		const exit_code = System.run(command, System.AppWinStype.Hide, true);
+		const out = output_std_txt.isFile() ? (output_std_txt.readString(icharset).replace(/\r?\n$/, "")) : "";
+		const error = output_err_txt.isFile() ? (output_err_txt.readString(icharset).replace(/\r?\n$/, "")) : "";
 		temp_folder.remove();
 
 		// エラーコードがある場合は、error の方に出力結果を入れる
 		return {
-			out : text,
-			error : ret ? text : "",
-			exit_code : ret
+			out : out,
+			error : error,
+			exit_code : exit_code
 		}
 	}
 

docs/source.html

@@ -163,9 +163,9 @@
       <td data-ice="filePath"><span><a href="file/src/senko/System.js.html">src/senko/System.js</a></span></td>
       <td data-ice="identifier" class="identifiers"><span><a href="class/src/senko/System.js~System.html">System</a></span></td>
       <td class="coverage"><span data-ice="coverage">100 %</span><span data-ice="coverageCount" class="coverage-count">35/35</span></td>
-      <td style="display: none;" data-ice="size">20602 byte</td>
-      <td style="display: none;" data-ice="lines">743</td>
-      <td style="display: none;" data-ice="updated">2021-05-07 11:55:19 (UTC)</td>
+      <td style="display: none;" data-ice="size">20855 byte</td>
+      <td style="display: none;" data-ice="lines">745</td>
+      <td style="display: none;" data-ice="updated">2021-05-07 12:03:57 (UTC)</td>
     </tr>
 <tr data-ice="file">
       <td data-ice="filePath"><span><a href="file/src/senko/polyfill/ExtendsArray.js.html">src/senko/polyfill/ExtendsArray.js</a></span></td>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "senkowsh",
-	"version": "7.5.0",
+	"version": "7.5.1",
 	"description": "JScirpt library for WSH that gathers various functions.",
 	"author": "natade-jp <natade3@gmail.com> (https://github.com/natade-jp)",
 	"repository": {

src/senko/System.js

@@ -401,7 +401,8 @@ export default class System {
 		// UTF-8 や Shift_JIS は直接実行できないので chcp 用のスクリプトを挟ませる
 		const temp_starter = new SFile(temp_folder.getAbsolutePath() + "//" + "start.bat");
 		const temp_script  = new SFile(temp_folder.getAbsolutePath() + "//" + "script.bat");
-		const output_txt  = new SFile(temp_folder.getAbsolutePath() + "//" + "output.txt");
+		const output_std_txt  = new SFile(temp_folder.getAbsolutePath() + "//" + "output_std.txt");
+		const output_err_txt  = new SFile(temp_folder.getAbsolutePath() + "//" + "output_err.txt");
 
 		/**
 		 * chcp 変更用のスクリプト
@@ -410,7 +411,7 @@ export default class System {
 		const starter_scrpt = [];
 		starter_scrpt.push("chcp " + chcp);
 		starter_scrpt.push("@echo off");
-		starter_scrpt.push("call \"" + temp_script + "\" > \"" + output_txt + "\"");
+		starter_scrpt.push("call \"" + temp_script + "\" 1> \"" + output_std_txt + "\" 2> \"" + output_err_txt + "\"");
 		starter_scrpt.push("");
 
 		// 途中から文字コードが変わることを想定するため BOM を付けない
@@ -423,15 +424,16 @@ export default class System {
 		const command = cmd_base + " \"" + temp_starter + "\"";
 
 		// 実行
-		const ret = System.run(command, System.AppWinStype.Hide, true);
-		const text = output_txt.isFile() ? (output_txt.readString(icharset).replace(/\r?\n$/, "")) : "";
+		const exit_code = System.run(command, System.AppWinStype.Hide, true);
+		const out = output_std_txt.isFile() ? (output_std_txt.readString(icharset).replace(/\r?\n$/, "")) : "";
+		const error = output_err_txt.isFile() ? (output_err_txt.readString(icharset).replace(/\r?\n$/, "")) : "";
 		temp_folder.remove();
 
 		// エラーコードがある場合は、error の方に出力結果を入れる
 		return {
-			out : text,
-			error : ret ? text : "",
-			exit_code : ret
+			out : out,
+			error : error,
+			exit_code : exit_code
 		}
 	}