From c550143a59d58512fe231f648d8982a01c5e70d1 Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Tue, 29 Sep 2020 15:34:13 +0100
Subject: [PATCH] Use 'rm -rf' instead of 'rm -fr' (#1084)

Not super urgent, but seeing as it closes #927, might as well do now.

[skip changelog]
---
 Makefile                | 2 +-
 bin/compile             | 2 +-
 bin/steps/pip-uninstall | 2 +-
 bin/steps/python        | 4 ++--
 builds/libraries/sqlite | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 0bbaced..4129c85 100644
--- a/Makefile
+++ b/Makefile
@@ -60,4 +60,4 @@ endif
 tools:
 	git clone https://github.com/kennethreitz/pip-pop.git
 	mv pip-pop/bin/* vendor/pip-pop/
-	rm -fr pip-pop
+	rm -rf pip-pop
diff --git a/bin/compile b/bin/compile
index f7b429f..920ff36 100755
--- a/bin/compile
+++ b/bin/compile
@@ -309,7 +309,7 @@ mtime "nltk.download.time" "${start}"
 # and copying it into the proper place (the logical place to do this was early, but it must be done here).
 # In CI, $BUILD_DIR is /app.
 if [[ ! "$BUILD_DIR" == "/app" ]]; then
-  rm -fr "$BUILD_DIR/.heroku/src"
+  rm -rf "$BUILD_DIR/.heroku/src"
   deep-cp /app/.heroku/src "$BUILD_DIR/.heroku/src"
 fi
 
diff --git a/bin/steps/pip-uninstall b/bin/steps/pip-uninstall
index 2e1ad8d..4e0ad91 100755
--- a/bin/steps/pip-uninstall
+++ b/bin/steps/pip-uninstall
@@ -16,7 +16,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
       mcount "failure.bad-requirements"
     fi
 
-    rm -fr requirements-declared.txt
+    rm -rf requirements-declared.txt
 
     if [[ -s .heroku/python/requirements-stale.txt ]]; then
       puts-step "Uninstalling stale dependencies"
diff --git a/bin/steps/python b/bin/steps/python
index 131c293..d6305c9 100755
--- a/bin/steps/python
+++ b/bin/steps/python
@@ -84,13 +84,13 @@ mcount "version.python.${PYTHON_VERSION}"
 
 if [[ "$STACK" != "$CACHED_PYTHON_STACK" ]]; then
     puts-step "Stack has changed from $CACHED_PYTHON_STACK to $STACK, clearing cache"
-    rm -fr .heroku/python-stack .heroku/python-version .heroku/python .heroku/vendor .heroku/python .heroku/python-sqlite3-version
+    rm -rf .heroku/python-stack .heroku/python-version .heroku/python .heroku/vendor .heroku/python .heroku/python-sqlite3-version
 fi
 
 if [ -f .heroku/python-version ]; then
   if [ ! "$(cat .heroku/python-version)" = "$PYTHON_VERSION" ]; then
       puts-step "Found $(cat .heroku/python-version), removing"
-      rm -fr .heroku/python
+      rm -rf .heroku/python
   else
     SKIP_INSTALL=1
   fi
diff --git a/builds/libraries/sqlite b/builds/libraries/sqlite
index e24484e..80cbc73 100755
--- a/builds/libraries/sqlite
+++ b/builds/libraries/sqlite
@@ -19,4 +19,4 @@ make install
 
 # Cleanup
 cd ..
-rm -fr sqlite
+rm -rf sqlite