Merge pull request #356 from twibiral/develop

Update to version 1.12.0

Author: twibiral

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 
+## [1.12.0]
+### Added
+- Dynamic path changes by adding %USERNAME% to the path (usable for python) (Thanks to @raffy8361)
+
+### Changed
+- Fix wrong code example in Readme (Thanks to @danielmeloalencar)
+- Fix file separator bug (Thanks to @nfiles)
+- Fix un-stoppable runtime environments (Thanks to @jamesbtan)
+
+
 ## [1.11.1]
 ### Changed
 - Fix the update; the previous version was not published correctly.

README.md

@@ -640,7 +640,7 @@ Variables functions, etc. defined in one code block will be available in other c
 console.log(f)
 ```
 ```js
-let f = 3;
+var f = 3;
 ```
 ``````
 

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "execute-code",
 	"name": "Execute Code",
-	"version": "1.11.1",
+	"version": "1.12.0",
 	"minAppVersion": "1.2.8",
 	"description": "Allows to execute code snippets within a note. Supported programming languages:  C, CPP, Dart, Golang, Groovy, Kotlin, Java, JavaScript, TypeScript, Lean, Lua, CSharp, Prolog, Rust, Python, R, Ruby, Wolfram Mathematica, Haskell, Scala, Racket, F#, Batch, Shell & Powershell.",
 	"author": "twibiral",

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "execute-code",
-	"version": "1.11.1",
+	"version": "1.12.0",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "src/main.js",
 	"scripts": {

package.json

@@ -1,6 +1,7 @@
 import {Notice} from "obsidian";
 import {Outputter} from "src/Outputter";
 import * as os from "os";
+import * as path from "path";
 import {LanguageId} from "src/main";
 import {EventEmitter} from "stream";
 
@@ -63,6 +64,6 @@ export default abstract class Executor extends EventEmitter {
 	protected getTempFile(ext: string) {
 		if (this.tempFileId === undefined)
 			this.tempFileId = Date.now().toString();
-		return `${os.tmpdir()}\\temp_${this.tempFileId}.${ext}`;
+		return path.join(os.tmpdir(), `temp_${this.tempFileId}.${ext}`);
 	}
 }

src/executors/Executor.ts

@@ -24,6 +24,10 @@ export default abstract class ReplExecutor extends AsyncExecutor {
             path = "wsl";
         }
 
+        // Replace %USERNAME% with actual username (if it exists)
+        if (path.includes("%USERNAME%") && process?.env?.USERNAME)
+            path = path.replace("%USERNAME%", process.env.USERNAME);
+
 		// Spawns a new REPL that is used to execute code.
 		// {env: process.env} is used to ensure that the environment variables are passed to the REPL.
         this.process = spawn(path, args, {env: process.env});

src/executors/ReplExecutor.ts

@@ -4,7 +4,14 @@ export default (pid: number) => {
     if(process.platform === "win32") {
         execSync(`taskkill /pid ${pid} /T /F`)
     } else {
-        execSync(`pkill -P ${pid}`)
+		try {
+	        execSync(`pkill -P ${pid}`)
+		} catch(err) {
+			// An error code of 1 signifies that no children were found to kill
+			// In this case, ignore the error
+			// Otherwise, re-throw it.
+			if (err.status !== 1) throw err;
+		}
         process.kill(pid);
     }
-}
+}

src/executors/killWithChildren.ts

@@ -1,3 +1,8 @@
+/**
+ * This script updates the version in manifest.json, package-lock.json, versions.json and CHANGELOG.md
+ * with the version specified in the package.json.
+ */
+
 import {readFileSync, writeFileSync} from "fs";
 
 const targetVersion = process.env.npm_package_version;

version-bump.mjs

@@ -46,5 +46,6 @@
 	"1.9.1": "1.2.8",
 	"1.10.0": "1.2.8",
 	"1.11.0": "1.2.8",
-	"1.11.1": "1.2.8"
+	"1.11.1": "1.2.8",
+	"1.12.0": "1.2.8"
 }