fix: remove executable option due to path issues

runreal · Apr 4, 2024 · 727e3fc · 727e3fc
1 parent 625c510
commit 727e3fc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -92,19 +92,17 @@ Options:
 Usage:   runtrigger add <script>
 Description:
   add a trigger
-Options:                                               
-  -e, --executable           - setup the trigger as an executable                                
-  -d, --deno-binary  <deno>  - path to the deno binary if not using executable  (Default: "deno")
+Options:                                                                        
+  -d, --deno-binary  <deno>  - override path to the deno binary (Default: "Deno.execPath()")
 ```
 
 ### `update`
 ```
 Usage:   runtrigger update <script>                
 Description:
   update a trigger
-Options:                                                 
-  -e, --executable           - setup the trigger as an executable                                
-  -d, --deno-binary  <deno>  - path to the deno binary if not using executable  (Default: "deno")
+Options:                                                                             
+  -d, --deno-binary  <deno>  - override path to the deno binary (Default: "Deno.execPath()")
 ```
 
 ### `rm`

diff --git a/src/index.ts b/src/index.ts
@@ -31,9 +31,8 @@ await new Command()
 	})
 	.command('add', 'add a trigger')
 	.arguments('<script:file>')
-	.option('-e, --executable', 'setup the trigger as an executable')
-	.option('-d, --deno-binary <deno:file>', 'path to the deno binary if not using executable', { default: 'deno' })
-	.action(async ({ executable, denoBinary }, script) => {
+	.option('-d, --deno-binary <deno:file>', 'override path to the deno binary', { default: 'Deno.execPath()' })
+	.action(async ({ denoBinary }, script) => {
 		if (script.startsWith('file://')) {
 			script = import.meta.resolve(script)
 		} else {
@@ -45,15 +44,10 @@ await new Command()
 		const cmd = await p4.runCommandZ(`triggers`, ['-o'])
 		const triggers = p4.parseTriggersOutput(cmd.output)
 
-		let triggerCommand = ''
-		if (executable) {
-			triggerCommand = `runtrigger exec ${script} ${config.args.join(' ')}`
-		} else {
-			// We want to run this cli as the entry point
-			const cliPath = path.fromFileUrl(import.meta.url)
-			triggerCommand = `${denoBinary} run -A ${cliPath} exec ${script} ${config.args.join(' ')}`
-		}
-
+		// We want to run this cli as the entry point
+		const cliPath = path.fromFileUrl(import.meta.url)
+		const triggerCommand = `${denoBinary} run -A ${cliPath} exec ${script} ${config.args.join(' ')}`
+
 		// Create a trigger for each type and path
 		const newTriggers: P4Trigger[] = []
 		config.type.map((type) => {
@@ -75,9 +69,8 @@ await new Command()
 	})
 	.command('update', 'update a trigger')
 	.arguments('<script:string>')
-	.option('-e, --executable', 'setup the trigger as an executable')
-	.option('-d, --deno-binary <deno:file>', 'path to the deno binary if not using executable', { default: 'deno' })
-	.action(async ({ executable, denoBinary }, script) => {
+	.option('-d, --deno-binary <deno:file>', 'override path to the deno binary', { default: 'deno' })
+	.action(async ({ denoBinary }, script) => {
 		if (script.startsWith('file://')) {
 			script = import.meta.resolve(script)
 		} else {
@@ -94,14 +87,10 @@ await new Command()
 			return
 		}
 
-		let triggerCommand = ''
-		if (executable) {
-			triggerCommand = `runtrigger exec ${script} ${config.args.join(' ')}`
-		} else {
-			// We want to run this cli as the entry point
-			const cliPath = path.fromFileUrl(import.meta.url)
-			triggerCommand = `${denoBinary} run -A ${cliPath} exec ${script} ${config.args.join(' ')}`
-		}
+		// We want to run this cli as the entry point
+		const cliPath = path.fromFileUrl(import.meta.url)
+		const triggerCommand = `${denoBinary} run -A ${cliPath} exec ${script} ${config.args.join(' ')}`
+
 		// Create a trigger for each type and path
 		const newTriggers: P4Trigger[] = []
 		config.type.map((type) => {