18069996051/mixly3-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make shell command robust against cached double quotes from frontend

Browse Source
This commit is contained in:
yczpf2019
2026-01-24 19:04:00 +08:00
parent 7cd59ef596
commit 6c6661c6c0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/shell-micropython.js
View File

@@ -15,7 +15,10 @@ export default class ShellMicroPython extends Shell {
esptool: `"${PYTHON.path.cli}" "${MICROPYTHON.path.esptool}"`, esptool: `"${PYTHON.path.cli}" "${MICROPYTHON.path.esptool}"`,
com: config.port com: config.port
}; };
const command = MString.tpl(config.command, info); // 兼容性处理：移除模板中可能存在的冗余引号
let cmdTemplate = config.command || "";
cmdTemplate = cmdTemplate.replace(/"{esptool}"/g, '{esptool}');
const command = MString.tpl(cmdTemplate, info);
console.log('DEBUG CMD BURN:', command); console.log('DEBUG CMD BURN:', command);
return this.execUntilClosed(command); return this.execUntilClosed(command);
} }
@@ -26,7 +29,10 @@ export default class ShellMicroPython extends Shell {
ampy: `"${PYTHON.path.cli}" "${MICROPYTHON.path.ampy}"`, ampy: `"${PYTHON.path.cli}" "${MICROPYTHON.path.ampy}"`,
com: config.port com: config.port
}; };
const command = MString.tpl(config.command, info); // 兼容性处理：移除模板中可能存在的冗余引号
let cmdTemplate = config.command || "";
cmdTemplate = cmdTemplate.replace(/"{ampy}"/g, '{ampy}');
const command = MString.tpl(cmdTemplate, info);
console.log('DEBUG CMD UPLOAD:', command); console.log('DEBUG CMD UPLOAD:', command);
return this.execUntilClosed(command); return this.execUntilClosed(command);
} }