cmd/aliases: Exit gracefully when version not in repo

Exit gracefully when the dot file contains a version that is not in the repository. Closes #40
jmooring · Sep 24, 2023 · 762d508 · 762d508
1 parent c83cbcf
commit 762d508
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/cmd/hvm/alias_scripts/bash.sh → cmd/hvm/aliases/bash.sh b/cmd/hvm/alias_scripts/bash.sh → cmd/hvm/aliases/bash.sh
@@ -8,7 +8,9 @@ hugo() {
     fi
   else
     if hugo_bin=$(hvm status --printExecPath); then
-      hvm use --useVersionInDotFile
+      if ! hvm use --useVersionInDotFile; then
+        return 1
+      fi
     else
       if ! hugo_bin=$(which hugo); then
         >&2 printf "Command not found.\\n"

diff --git a/cmd/hvm/alias_scripts/fish.sh → cmd/hvm/aliases/fish.sh b/cmd/hvm/alias_scripts/fish.sh → cmd/hvm/aliases/fish.sh
@@ -8,7 +8,9 @@ hugo() {
     fi
   else
     if hugo_bin=$(hvm status --printExecPath); then
-      hvm use --useVersionInDotFile
+      if ! hvm use --useVersionInDotFile; then
+        return 1
+      fi
     else
       if ! hugo_bin=$(which hugo); then
         >&2 printf "Command not found.\\n"

diff --git a/cmd/hvm/alias_scripts/powershell.ps1 → cmd/hvm/aliases/powershell.ps1 b/cmd/hvm/alias_scripts/powershell.ps1 → cmd/hvm/aliases/powershell.ps1
@@ -12,6 +12,9 @@ function Hugo-Override {
     Set-Variable -Name "hugo_bin" -Value $(hvm status --printExecPath)
     If ($hugo_bin) {
       hvm use --useVersionInDotFile
+      if ($lastexitcode) {
+        return 1
+      }
     } Else {
       Set-Variable -Name "hugo_bin" -Value $((gcm hugo.exe).Path 2> $null)
       If ($hugo_bin) {

diff --git a/cmd/hvm/alias_scripts/zsh.sh → cmd/hvm/aliases/zsh.sh b/cmd/hvm/alias_scripts/zsh.sh → cmd/hvm/aliases/zsh.sh
@@ -8,7 +8,9 @@ hugo() {
     fi
   else
     if hugo_bin=$(hvm status --printExecPath); then
-      hvm use --useVersionInDotFile
+      if ! hvm use --useVersionInDotFile; then
+        return 1
+      fi
     else
       if ! hugo_bin=$(which hugo); then
         >&2 printf "Command not found.\\n"

diff --git a/cmd/hvm/bash.go b/cmd/hvm/bash.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-//go:embed alias_scripts/bash.sh
+//go:embed aliases/bash.sh
 var bashScript string
 
 // bashCmd represents the bash command

diff --git a/cmd/hvm/fish.go b/cmd/hvm/fish.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-//go:embed alias_scripts/fish.sh
+//go:embed aliases/fish.sh
 var fishScript string
 
 // fishCmd represents the fish command

diff --git a/cmd/hvm/powershell.go b/cmd/hvm/powershell.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-//go:embed alias_scripts/powershell.ps1
+//go:embed aliases/powershell.ps1
 var powershellScript string
 
 // powershellCmd represents the powershell command

diff --git a/cmd/hvm/zsh.go b/cmd/hvm/zsh.go
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-//go:embed alias_scripts/zsh.sh
+//go:embed aliases/zsh.sh
 var zshScript string
 
 // zshCmd represents the zsh command