dave/synclib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Fix home resolution issue

Browse Source
This commit is contained in:
PhatPhuckDave
2025-10-17 09:33:43 +02:00
parent 3f0791466b
commit ff76a5399c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
instruction.go
View File

@@ -334,8 +334,13 @@ func preprocessInstructions(instructions []LinkInstruction, filename, workdir st
// loadFromReference loads instructions from a referenced file // loadFromReference loads instructions from a referenced file
func loadFromReference(fromFile, currentFile, workdir string, visited map[string]bool) ([]LinkInstruction, error) { func loadFromReference(fromFile, currentFile, workdir string, visited map[string]bool) ([]LinkInstruction, error) {
// First convert home directory if it starts with ~
fromPath, err := ConvertHome(fromFile)
if err != nil {
return nil, fmt.Errorf("error converting home directory: %w", err)
}
// Convert relative paths to absolute paths based on the current file's directory // Convert relative paths to absolute paths based on the current file's directory
fromPath := fromFile
if !filepath.IsAbs(fromPath) { if !filepath.IsAbs(fromPath) {
currentDir := filepath.Dir(currentFile) currentDir := filepath.Dir(currentFile)
fromPath = filepath.Join(currentDir, fromPath) fromPath = filepath.Join(currentDir, fromPath)