From dbab98c8e088c04e0501fb5a2c2acd399b4f9721 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Sun, 10 Mar 2019 21:56:36 +0000
Subject: [PATCH] Remove util.RemoveAll - should have been removed since go 1.7
 (#6299)

---
 models/admin.go                |  3 ++-
 modules/util/remove.go         | 14 --------------
 modules/util/remove_windows.go | 16 ----------------
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 modules/util/remove.go
 delete mode 100644 modules/util/remove_windows.go

diff --git a/models/admin.go b/models/admin.go
index 06b7c14c6..275fff277 100644
--- a/models/admin.go
+++ b/models/admin.go
@@ -6,6 +6,7 @@ package models
 
 import (
 	"fmt"
+	"os"
 
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/util"
@@ -60,7 +61,7 @@ func RemoveAllWithNotice(title, path string) {
 }
 
 func removeAllWithNotice(e Engine, title, path string) {
-	if err := util.RemoveAll(path); err != nil {
+	if err := os.RemoveAll(path); err != nil {
 		desc := fmt.Sprintf("%s [%s]: %v", title, path, err)
 		log.Warn(desc)
 		if err = createNotice(e, NoticeRepository, desc); err != nil {
diff --git a/modules/util/remove.go b/modules/util/remove.go
deleted file mode 100644
index 8bca14991..000000000
--- a/modules/util/remove.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !windows,!go1.7 go1.7
-
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package util
-
-import "os"
-
-// RemoveAll files from Go version 1.7 onward
-func RemoveAll(path string) error {
-	return os.RemoveAll(path)
-}
diff --git a/modules/util/remove_windows.go b/modules/util/remove_windows.go
deleted file mode 100644
index f5891a589..000000000
--- a/modules/util/remove_windows.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build windows,!go1.7
-
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package util
-
-// RemoveAll files from path on windows
-// workaround for Go not being able to remove read-only files/folders: https://github.com/golang/go/issues/9606
-// this bug should be fixed on Go 1.7, so the workaround should be removed when Gitea don't support Go 1.6 anymore:
-// https://github.com/golang/go/commit/2ffb3e5d905b5622204d199128dec06cefd57790
-func RemoveAll(path string) error {
-	path = strings.Replace(path, "/", "\\", -1)
-	return exec.Command("cmd", "/C", "rmdir", "/S", "/Q", path).Run()
-}