Try not to leave directories behind with incorrect permissions

osutil/osutil.go

@@ -7,17 +7,28 @@ package osutil
 
 import (
 	"os"
+	"path/filepath"
 	"runtime"
 )
 
 func Rename(from, to string) error {
+	// Make sure the destination directory is writeable
+	toDir := filepath.Dir(to)
+	if info, err := os.Stat(toDir); err == nil {
+		os.Chmod(toDir, 0777)
+		defer os.Chmod(toDir, info.Mode())
+	}
+
+	// On Windows, make sure the destination file is writeable (or we can't delete it)
 	if runtime.GOOS == "windows" {
-		os.Chmod(to, 0666) // Make sure the file is user writeable
+		os.Chmod(to, 0666)
 		err := os.Remove(to)
 		if err != nil && !os.IsNotExist(err) {
 			return err
 		}
 	}
-	defer os.Remove(from) // Don't leave a dangling temp file in case of rename error
+
+	// Don't leave a dangling temp file in case of rename error
+	defer os.Remove(from)
 	return os.Rename(from, to)
 }