Fix issue with incorrectly parsing ~

This commit is contained in:
2024-10-18 20:19:31 +02:00
parent 41bac18525
commit 653e883742
3 changed files with 12 additions and 1 deletions

View File

@@ -18,6 +18,16 @@ type LinkInstruction struct {
Delete bool Delete bool
} }
func (instruction *LinkInstruction) Tidy() {
instruction.Source = strings.ReplaceAll(instruction.Source, "\"", "")
instruction.Source = strings.ReplaceAll(instruction.Source, "\\", "/")
instruction.Source = strings.TrimSpace(instruction.Source)
instruction.Target = strings.ReplaceAll(instruction.Target, "\"", "")
instruction.Target = strings.ReplaceAll(instruction.Target, "\\", "/")
instruction.Target = strings.TrimSpace(instruction.Target)
}
func (instruction *LinkInstruction) String() string { func (instruction *LinkInstruction) String() string {
return fmt.Sprintf("%s%s%s%s%s%s%s%s%s%s%s%s%s", SourceColor, instruction.Source, DefaultColor, deliminer, TargetColor, instruction.Target, DefaultColor, deliminer, strconv.FormatBool(instruction.Force), deliminer, strconv.FormatBool(instruction.Hard), deliminer, strconv.FormatBool(instruction.Delete)) return fmt.Sprintf("%s%s%s%s%s%s%s%s%s%s%s%s%s", SourceColor, instruction.Source, DefaultColor, deliminer, TargetColor, instruction.Target, DefaultColor, deliminer, strconv.FormatBool(instruction.Force), deliminer, strconv.FormatBool(instruction.Hard), deliminer, strconv.FormatBool(instruction.Delete))
} }
@@ -48,6 +58,7 @@ func ParseInstruction(line, workdir string) (LinkInstruction, error) {
instruction.Force = res instruction.Force = res
} }
instruction.Tidy()
instruction.Source, _ = ConvertHome(instruction.Source) instruction.Source, _ = ConvertHome(instruction.Source)
instruction.Target, _ = ConvertHome(instruction.Target) instruction.Target, _ = ConvertHome(instruction.Target)

1
sync Normal file
View File

@@ -0,0 +1 @@
foo,"~/bar"

View File

@@ -1 +0,0 @@
foo,bar,,t