From 4e3f5cfbc6bcdcd56fb9c5f45007cbc153d77081 Mon Sep 17 00:00:00 2001
From: Celestino Amoroso <celestino.amoroso@gmail.com>
Date: Fri, 19 Jul 2024 15:33:15 +0200
Subject: [PATCH] import-utils.go: Paths are now expanded with respect to
 env-vars and shell ~

---
 import-utils.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/import-utils.go b/import-utils.go
index e7d7121..78e464b 100644
--- a/import-utils.go
+++ b/import-utils.go
@@ -75,7 +75,11 @@ func isFile(filePath string) bool {
 }
 
 func searchAmongPath(filename string, dirList []string) (filePath string) {
+	var err error
 	for _, dir := range dirList {
+		if dir, err = ExpandPath(dir); err != nil {
+			continue
+		}
 		if fullPath := path.Join(dir, filename); isFile(fullPath) {
 			filePath = fullPath
 			break
@@ -90,6 +94,10 @@ func isPathRelative(filePath string) bool {
 }
 
 func makeFilepath(filename string, dirList []string) (filePath string, err error) {
+	if filename, err = ExpandPath(filename); err != nil {
+		return
+	}
+
 	if path.IsAbs(filename) || isPathRelative(filename) {
 		if isFile(filename) {
 			filePath = filename