From 3f3395fdf4992d907ccdfaf4bd2d5b3a8c66ebf3 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 22 Feb 2019 20:08:42 +0000 Subject: [PATCH] buildsystem: switch rm -fr to rm -rf for consistency/OCD --- config/multithread | 2 +- scripts/unpack | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/multithread b/config/multithread index 1c14ddfc70..26a9c2ceb6 100644 --- a/config/multithread +++ b/config/multithread @@ -144,7 +144,7 @@ start_multithread_build() { local singlethread buildopts # init thread control folder - rm -fr "${THREAD_CONTROL}" + rm -rf "${THREAD_CONTROL}" mkdir -p "${THREAD_CONTROL}/locks" echo -1 >"${THREAD_CONTROL}/progress.prev" echo 0 >"${THREAD_CONTROL}/progress" diff --git a/scripts/unpack b/scripts/unpack index 1fc760aefc..5415acf5aa 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -54,7 +54,7 @@ if [ -d "$SOURCES/${PKG_NAME}" -o -d "$PKG_DIR/sources" ]; then # unpack into a unique location as unpacking into a single ${BUILD} directory is not thread-safe PKG_UNPACK_DIR="${BUILD}/.unpack/${PKG_NAME}" - rm -fr "${PKG_UNPACK_DIR}" + rm -rf "${PKG_UNPACK_DIR}" mkdir -p "${PKG_UNPACK_DIR}" pkg_call_exists pre_unpack && pkg_call pre_unpack @@ -84,7 +84,7 @@ if [ -d "$SOURCES/${PKG_NAME}" -o -d "$PKG_DIR/sources" ]; then fi # cleanup - rm -fr "${PKG_UNPACK_DIR}" + rm -rf "${PKG_UNPACK_DIR}" if [ -d "$PKG_DIR/sources" ]; then [ ! -d "$PKG_BUILD" ] && mkdir -p "$PKG_BUILD"