feat: add hasCommand function to find executables

resolves #60
JanDeDobbeleer · Nov 25, 2023 · 35a6520 · 35a6520
1 parent 573f64f
commit 35a6520
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,7 +6,7 @@
   "[go]": {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": true
+      "source.organizeImports": "explicit"
     }
   },
   "go.formatTool": "gofmt",

diff --git a/src/core/init.go b/src/core/init.go
@@ -24,9 +24,9 @@ func Init(configPath, sh string, printOutput bool) string {
 		return errorString
 	}
 
+	aliae.Paths.Render()
 	aliae.Aliae.Render()
 	aliae.Envs.Render()
-	aliae.Paths.Render()
 	aliae.Scripts.Render()
 
 	script := shell.DotFile.String()

diff --git a/src/shell/aliae.go b/src/shell/aliae.go
@@ -89,6 +89,10 @@ func (a Aliae) Render() {
 			continue
 		}
 
+		if first && DotFile.Len() > 0 {
+			DotFile.WriteString("\n\n")
+		}
+
 		if !first {
 			DotFile.WriteString("\n")
 		}

diff --git a/src/shell/template.go b/src/shell/template.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"os"
+	"os/exec"
 	"strings"
 	"text/template"
 
@@ -53,6 +54,7 @@ func funcMap() template.FuncMap {
 		"escapeString": escapeString,
 		"env":          os.Getenv,
 		"match":        match,
+		"hasCommand":   hasCommand,
 	}
 	return template.FuncMap(funcMap)
 }
@@ -91,3 +93,8 @@ func match(variable string, values ...string) bool {
 	}
 	return false
 }
+
+func hasCommand(command string) bool {
+	_, err := exec.LookPath(command)
+	return err == nil
+}
diff --git a/website/docs/setup/templates.mdx b/website/docs/setup/templates.mdx
@@ -19,13 +19,14 @@ configuration across multiple environments resulting in environment specific val
 
 Out of the box you get the following functionality:
 
-| Name     | Type       | Description                                                 | Example                                                                      |
-| -------- | ---------- | ----------------------------------------------------------- | ---------------------------------------------------------------------------- |
-| `.Shell` | `string`   | the current shell name                                      | `{{ .Shell }}`                                                               |
-| `.Home`  | `string`   | the user's `$HOME` folder                                   | `{{ .Home }}/go/bin/aliae`                                                   |
-| `.OS`    | `string`   | the current operating system (`windows`, `darwin`, `linux`) | `{{ .Home }}/go/bin/aliae{{ if eq .OS "windows" }}.exe{{ end }}`             |
-| `.Arch`  | `string`   | the `aliae` executable's compiled architecture              | `{{ .Home }}/go/bin/aliae-{{ .Arch }}{{ if eq .OS "windows" }}.exe{{ end }}` |
-| `env`    | `function` | retrieve an environment variable value                      | `{{ env "POSH_THEME" }}`                                                     |
-| `match`  | `function` | match a shell name to one or multiple options               | `{{ match .Shell "zsh" "bash" }}`                                            |
+| Name         | Type      | Description                                                 | Example                                                                      |
+| ------------ | --------- | ----------------------------------------------------------- | ---------------------------------------------------------------------------- |
+| `.Shell`     | `string`  | the current shell name                                      | `{{ .Shell }}`                                                               |
+| `.Home`      | `string`  | the user's `$HOME` folder                                   | `{{ .Home }}/go/bin/aliae`                                                   |
+| `.OS`        | `string`  | the current operating system (`windows`, `darwin`, `linux`) | `{{ .Home }}/go/bin/aliae{{ if eq .OS "windows" }}.exe{{ end }}`             |
+| `.Arch`      | `string`  | the `aliae` executable's compiled architecture              | `{{ .Home }}/go/bin/aliae-{{ .Arch }}{{ if eq .OS "windows" }}.exe{{ end }}` |
+| `env`        | `string`  | retrieve an environment variable value                      | `{{ env "POSH_THEME" }}`                                                     |
+| `match`      | `boolean` | match a shell name to one or multiple options               | `{{ match .Shell "zsh" "bash" }}`                                            |
+| `hasCommand` | `boolean` | check if an executable exists                               | `{{ hasCommand "oh-my-posh" }}`                                              |
 
 [go-text-template]: https://golang.org/pkg/text/template/