update

admpub · admpub · commit d0bfc3ba575e · 2022-02-16T18:58:49.000+08:00
diff --git a/file.go b/file.go
@@ -135,13 +135,15 @@ func Copy(src, dest string) error {
 */
 func Rename(src, dest string) error {
 	if err := os.Rename(src, dest); err != nil {
-		if err.Error() != `invalid cross-device link` {
+		if !strings.HasSuffix(err.Error(), `invalid cross-device link`) {
 			return err
 		}
 	}
 	err := Copy(src, dest)
 	if err != nil {
-		return err
+		if !strings.HasSuffix(err.Error(), `operation not permitted`) {
+			return err
+		}
 	}
 	// The copy was successful, so now delete the original file
 	err = os.Remove(src)

Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,15 @@ func Copy(src, dest string) error {`
`135`	`135`	`*/`
`136`	`136`	`func Rename(src, dest string) error {`
`137`	`137`	`if err := os.Rename(src, dest); err != nil {`
`138`		- if err.Error() != `invalid cross-device link` {
	`138`	+ if !strings.HasSuffix(err.Error(), `invalid cross-device link`) {
`139`	`139`	`return err`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`	`err := Copy(src, dest)`
`143`	`143`	`if err != nil {`
`144`		`- return err`
	`144`	+ if !strings.HasSuffix(err.Error(), `operation not permitted`) {
	`145`	`+ return err`
	`146`	`+ }`
`145`	`147`	`}`
`146`	`148`	`// The copy was successful, so now delete the original file`
`147`	`149`	`err = os.Remove(src)`