From 8d695bc8d79200289dc5530bf117e29bbbfc83b3 Mon Sep 17 00:00:00 2001
From: Alexander Mancevice <alexander.mancevice@hey.com>
Date: Sun, 5 Sep 2021 10:57:49 -0400
Subject: [PATCH] simplify logic to expand included paths

---
 taskfile/read/taskfile.go | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/taskfile/read/taskfile.go b/taskfile/read/taskfile.go
index e932104a..9c765ee6 100644
--- a/taskfile/read/taskfile.go
+++ b/taskfile/read/taskfile.go
@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
-	"strings"
 
 	"gopkg.in/yaml.v3"
 
@@ -51,16 +50,13 @@ func Taskfile(dir string, entrypoint string) (*taskfile.Taskfile, error) {
 			}
 		}
 
-		if filepath.IsAbs(includedTask.Taskfile) {
-			path = includedTask.Taskfile
-		} else if strings.HasPrefix(includedTask.Taskfile, "~") {
-			home, err := execext.Expand("~")
-			if err != nil {
-				return err
-			}
-			path = strings.Replace(includedTask.Taskfile, "~", home, 1)
-		} else {
-			path = filepath.Join(dir, includedTask.Taskfile)
+		path, err := execext.Expand(includedTask.Taskfile)
+		if err != nil {
+			return err
+		}
+
+		if ! filepath.IsAbs(path) {
+			path = filepath.Join(dir, path)
 		}
 
 		info, err := os.Stat(path)