chore: get setup env var from base class

oclif · Jan 30, 2024 · 9567ccd · 9567ccd
1 parent 89895ff
commit 9567ccd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/base.ts b/src/base.ts
@@ -29,6 +29,10 @@ export abstract class AutocompleteBase extends Command {
     }
   }
 
+  public getSetupEnvVar(shell: string): string {
+    return `${this.cliBinEnvVar}_AC_${shell.toUpperCase()}_SETUP_PATH`
+  }
+
   writeLogFile(msg: string) {
     mkdirSync(this.config.cacheDir, {recursive: true})
     const entry = `[${new Date().toISOString()}] ${msg}\n`

diff --git a/src/commands/autocomplete/index.ts b/src/commands/autocomplete/index.ts
@@ -48,7 +48,7 @@ export default class Index extends AutocompleteBase {
   }
 
   private printShellInstructions(shell: string): void {
-    const setupEnvVar = `${this.cliBinEnvVar}_AC_${shell.toUpperCase()}_SETUP_PATH`
+    const setupEnvVar = this.getSetupEnvVar(shell)
     const tabStr = shell === 'bash' ? '<TAB><TAB>' : '<TAB>'
     const scriptCommand = `${this.config.bin} autocomplete${this.config.topicSeparator}script ${shell}`
 

diff --git a/src/commands/autocomplete/script.ts b/src/commands/autocomplete/script.ts
@@ -20,8 +20,6 @@ export default class Script extends AutocompleteBase {
     const {args} = await this.parse(Script)
     const shell = args.shell ?? this.config.shell
 
-    const binUpcase = this.cliBinEnvVar
-    const shellUpcase = shell.toUpperCase()
     if (shell === 'powershell') {
       const completionFuncPath = path.join(
         this.config.cacheDir,
@@ -33,12 +31,10 @@ export default class Script extends AutocompleteBase {
       this.log(`. ${completionFuncPath}`)
     } else {
       this.log(
-        `${this.prefix}${binUpcase}_AC_${shellUpcase}_SETUP_PATH=${path.join(
+        `${this.prefix}${this.getSetupEnvVar(shell)}=${path.join(
           this.autocompleteCacheDir,
           `${shell}_setup`,
-        )} && test -f $${binUpcase}_AC_${shellUpcase}_SETUP_PATH && source $${binUpcase}_AC_${shellUpcase}_SETUP_PATH;${
-          this.suffix
-        }`,
+        )} && test -f $${this.getSetupEnvVar(shell)} && source $${this.getSetupEnvVar(shell)};${this.suffix}`,
       )
     }
   }