Fix issue with incorrectly parsing ~
This commit is contained in:
@@ -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)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user