minor clean up

particle-iot · Feb 3, 2025 · 23f4796 · 23f4796
1 parent a728fb5
commit 23f4796
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/cmd/flash.js b/src/cmd/flash.js
@@ -117,7 +117,7 @@ module.exports = class FlashCommand extends CLICommandBase {
 				skipReset
 			});
 			await qdl.run();
-			fs.appendFileSync(outputLog, 'OS Download complete.');
+			fs.appendFileSync(outputLog, `OS Download complete.${os.EOL}`);
 		} catch (error) {
 			fs.appendFileSync(outputLog, 'Download failed with error: ' + error.message);
 			throw new Error('Download failed with error: ' + error.message);
@@ -137,7 +137,7 @@ module.exports = class FlashCommand extends CLICommandBase {
 			});
 
 			await qdl.run();
-			fs.appendFileSync(output, 'Config file download complete.');
+			fs.appendFileSync(output, `Config file download complete.${os.EOL}`);
 		} catch (error) {
 			fs.appendFileSync(output, 'Download failed with error: ' + error.message);
 			throw new Error('Download failed with error: ' + error.message);

diff --git a/src/lib/qdl.js b/src/lib/qdl.js
@@ -28,14 +28,15 @@ class QdlFlasher {
 	}
 
 	async run() {
+		let qdlProcess;
 		try {
 			const qdlPath = await this.getExecutable();
 			const qdlArguments = this.buildArgs({ files: this.files, includeDir: this.includeDir, zip: this.zip });
 			this.progressBar = this.ui.createProgressBar();
 			const command = `${qdlPath} ${qdlArguments.join(' ')}`;
 			fs.appendFileSync(this.outputLogFile, `Command: ${command}\n`);
 
-			const qdlProcess = execa(qdlPath, qdlArguments, {
+			qdlProcess = execa(qdlPath, qdlArguments, {
 				cwd: this.updateFolder || process.cwd(),
 				stdio: 'pipe'
 			});
@@ -56,6 +57,9 @@ class QdlFlasher {
 			if (this.progressBarInitialized) {
 				this.progressBar.stop();
 			}
+			if (qdlProcess && qdlProcess.kill) {
+				qdlProcess.kill();
+			}
 		}
 	}