More betterify logging
This commit is contained in:
@@ -132,12 +132,14 @@ func isTrue(value string) bool {
|
||||
func (instruction *LinkInstruction) RunAsync(status chan (error)) {
|
||||
defer close(status)
|
||||
if !FileExists(instruction.Source) {
|
||||
status <- fmt.Errorf("instruction source %s%s%s does not exist", SourceColor, instruction.Source, DefaultColor)
|
||||
status <- fmt.Errorf("instruction source %s does not exist", FormatSourcePath(instruction.Source))
|
||||
return
|
||||
}
|
||||
|
||||
if !instruction.Force && AreSame(instruction.Source, instruction.Target) {
|
||||
status <- fmt.Errorf("source %s%s%s and target %s%s%s are the same, %snothing to do...%s", SourceColor, instruction.Source, DefaultColor, TargetColor, instruction.Target, DefaultColor, PathColor, DefaultColor)
|
||||
status <- fmt.Errorf("source %s and target %s are the same, nothing to do...",
|
||||
FormatSourcePath(instruction.Source),
|
||||
FormatTargetPath(instruction.Target))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -145,21 +147,24 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
|
||||
if instruction.Force {
|
||||
isSymlink, err := IsSymlink(instruction.Target)
|
||||
if err != nil {
|
||||
status <- fmt.Errorf("could not determine whether %s%s%s is a sym link or not, stopping; err: %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
|
||||
status <- fmt.Errorf("could not determine whether %s is a sym link or not, stopping; err: %v",
|
||||
FormatTargetPath(instruction.Target), err)
|
||||
return
|
||||
}
|
||||
|
||||
if instruction.Hard {
|
||||
info, err := os.Stat(instruction.Target)
|
||||
if err != nil {
|
||||
status <- fmt.Errorf("could not stat %s%s%s, stopping; err: %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
|
||||
status <- fmt.Errorf("could not stat %s, stopping; err: %v",
|
||||
FormatTargetPath(instruction.Target), err)
|
||||
return
|
||||
}
|
||||
if info.Mode().IsRegular() && info.Name() == filepath.Base(instruction.Source) {
|
||||
LogTarget("Overwriting existing file %s", instruction.Target)
|
||||
err := os.Remove(instruction.Target)
|
||||
if err != nil {
|
||||
status <- fmt.Errorf("could not remove existing file %s%s%s; err: %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
|
||||
status <- fmt.Errorf("could not remove existing file %s; err: %v",
|
||||
FormatTargetPath(instruction.Target), err)
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -169,23 +174,27 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
|
||||
LogTarget("Removing symlink at %s", instruction.Target)
|
||||
err = os.Remove(instruction.Target)
|
||||
if err != nil {
|
||||
status <- fmt.Errorf("failed deleting %s%s%s due to %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
|
||||
status <- fmt.Errorf("failed deleting %s due to %v",
|
||||
FormatTargetPath(instruction.Target), err)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if !instruction.Delete {
|
||||
status <- fmt.Errorf("refusing to delte actual (non symlink) file %s%s%s", TargetColor, instruction.Target, DefaultColor)
|
||||
status <- fmt.Errorf("refusing to delte actual (non symlink) file %s",
|
||||
FormatTargetPath(instruction.Target))
|
||||
return
|
||||
}
|
||||
LogImportant("Deleting (!!!) %s", instruction.Target)
|
||||
err = os.RemoveAll(instruction.Target)
|
||||
if err != nil {
|
||||
status <- fmt.Errorf("failed deleting %s%s%s due to %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
|
||||
status <- fmt.Errorf("failed deleting %s due to %v",
|
||||
FormatTargetPath(instruction.Target), err)
|
||||
return
|
||||
}
|
||||
}
|
||||
} else {
|
||||
status <- fmt.Errorf("target %s%s%s exists - handle manually or set the 'forced' flag (3rd field)", TargetColor, instruction.Target, DefaultColor)
|
||||
status <- fmt.Errorf("target %s exists - handle manually or set the 'forced' flag (3rd field)",
|
||||
FormatTargetPath(instruction.Target))
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -194,7 +203,8 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
|
||||
if _, err := os.Stat(targetDir); os.IsNotExist(err) {
|
||||
err = os.MkdirAll(targetDir, 0755)
|
||||
if err != nil {
|
||||
status <- fmt.Errorf("failed creating directory %s%s%s due to %s%+v%s", TargetColor, targetDir, DefaultColor, ErrorColor, err, DefaultColor)
|
||||
status <- fmt.Errorf("failed creating directory %s due to %v",
|
||||
FormatTargetPath(targetDir), err)
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -206,7 +216,10 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
|
||||
err = os.Symlink(instruction.Source, instruction.Target)
|
||||
}
|
||||
if err != nil {
|
||||
status <- fmt.Errorf("failed creating symlink between %s%s%s and %s%s%s with error %s%+v%s", SourceColor, instruction.Source, DefaultColor, TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
|
||||
status <- fmt.Errorf("failed creating symlink between %s and %s with error %v",
|
||||
FormatSourcePath(instruction.Source),
|
||||
FormatTargetPath(instruction.Target),
|
||||
err)
|
||||
return
|
||||
}
|
||||
LogInfo("Created symlink between %s and %s",
|
||||
|
Reference in New Issue
Block a user