From f94fb1b5226781551051daa3761919346e8c4b3e Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sun, 7 Jun 2015 03:05:02 +0100 Subject: Replace rm -r with rm -R --- resources/scripts/helpers/build/clean/rom_images | 2 +- resources/scripts/helpers/build/external/source | 4 ++-- resources/scripts/helpers/build/release/archives | 18 +++++++++--------- resources/scripts/helpers/build/roms/helper | 6 +++--- resources/scripts/helpers/download/bucts | 2 +- resources/scripts/helpers/download/coreboot | 4 ++-- resources/scripts/helpers/download/flashrom | 2 +- resources/scripts/helpers/download/grub | 2 +- resources/scripts/helpers/download/memtest86plus | 2 +- resources/utilities/ich9deblob/Makefile | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) (limited to 'resources') diff --git a/resources/scripts/helpers/build/clean/rom_images b/resources/scripts/helpers/build/clean/rom_images index 02833c33..3a7d90c0 100755 --- a/resources/scripts/helpers/build/clean/rom_images +++ b/resources/scripts/helpers/build/clean/rom_images @@ -28,7 +28,7 @@ set -u -e # -------------------------------------------------------- # delete the bin/ directory -rm -rf bin/ +rm -Rf bin/ printf "Deleted the bin/ directory containing the ROM images.\n\n" diff --git a/resources/scripts/helpers/build/external/source b/resources/scripts/helpers/build/external/source index 31dc2fd0..e6b9209b 100755 --- a/resources/scripts/helpers/build/external/source +++ b/resources/scripts/helpers/build/external/source @@ -26,7 +26,7 @@ set -u -e printf "Creating source archive for flashrom and bucts\n" # delete the old data -rm -rf tobuild +rm -Rf tobuild rm -f tobuild.tar.xz # this is where they will go @@ -68,6 +68,6 @@ cp resources/scripts/misc/powertop.trisquel7 tobuild/ tar -c tobuild | xz -9e >tobuild.tar.xz # and delete the directory -rm -rf tobuild/ +rm -Rf tobuild/ printf "\n\n" diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/archives index d48038ab..1795df02 100755 --- a/resources/scripts/helpers/build/release/archives +++ b/resources/scripts/helpers/build/release/archives @@ -55,8 +55,8 @@ cat .git/refs/heads/master > commitid printf "Deleting the old release archives\n" rm -f libreboot_*.tar.xz rm -f tobuild.tar.xz -rm -rf release/ -rm -rf tobuild/ +rm -Rf release/ +rm -Rf tobuild/ # ### Create the release/ directory where the archives will go # ---------------------------------------------------------------------------------------------------------------------------- @@ -82,7 +82,7 @@ cp -R bucts bucts_ mkdir libreboot_util/bucts/ mkdir libreboot_util/bucts/"$arch"/ mv bucts/bucts libreboot_util/bucts/"$arch"/ -rm -rf bucts/ +rm -Rf bucts/ mv bucts_/ bucts/ # ---------------- @@ -100,7 +100,7 @@ mv flashrom ../libreboot_util/flashrom/"$arch" mv flashrom_lenovobios_sst ../libreboot_util/flashrom/"$arch" mv flashrom_lenovobios_macronix ../libreboot_util/flashrom/"$arch" cd ../ -rm -rf flashrom +rm -Rf flashrom mv flashrom_ flashrom # ---------------- @@ -133,7 +133,7 @@ mkdir ../../../libreboot_util/cbfstool/armv7l mv cbfstool ../../../libreboot_util/cbfstool/armv7l/ cd ../ -rm -rf cbfstool +rm -Rf cbfstool mv cbfstool_ cbfstool cd ../../ @@ -173,7 +173,7 @@ mv ich9gen ../../../libreboot_util/ich9deblob/armv7l/ mv demefactory ../../../libreboot_util/ich9deblob/armv7l/ cd ../ -rm -rf ich9deblob +rm -Rf ich9deblob mv ich9deblob_ ich9deblob cd ../../ @@ -201,7 +201,7 @@ if [ "$arch" = "x86_64" ] fi cd ../ -rm -rf nvramtool +rm -Rf nvramtool mv nvramtool_ nvramtool cd ../../ @@ -228,7 +228,7 @@ if [ "$arch" = "x86_64" ] mv cbmem ../../../libreboot_util/cbmem/i686/ fi cd ../ -rm -rf cbmem +rm -Rf cbmem mv cbmem_ cbmem cd ../../ @@ -271,7 +271,7 @@ printf "\n\n" # ---------------------------------------------------------------------------------------------------------------------------- # The uncompressed archives are no longer needed -rm -rf libreboot_util +rm -Rf libreboot_util # For those utilities that have to be built on the target ./build external source diff --git a/resources/scripts/helpers/build/roms/helper b/resources/scripts/helpers/build/roms/helper index aa2dcc7e..a89ea578 100755 --- a/resources/scripts/helpers/build/roms/helper +++ b/resources/scripts/helpers/build/roms/helper @@ -103,20 +103,20 @@ do done # This config-less ROM is no longer needed - rm -rf "$1"_"$romtype".rom + rm -Rf "$1"_"$romtype".rom done # Now we clean up and prepare the bin directory containing all the images # ---------------------------------------------------------------------------------------------------------------------------- # prepare directory for new ROM images -rm -rf "$1" +rm -Rf "$1" mkdir "$1" # move the ROM's into the newly created directory mv "$1"*rom "$1" # delete the old ROM's from ../bin -rm -rf ../bin/"$1" +rm -Rf ../bin/"$1" # now put the new ROM's in ./bin mv "$1" ../bin diff --git a/resources/scripts/helpers/download/bucts b/resources/scripts/helpers/download/bucts index b5defead..2fc543fc 100755 --- a/resources/scripts/helpers/download/bucts +++ b/resources/scripts/helpers/download/bucts @@ -31,7 +31,7 @@ set -u -e printf "Downloading bucts\n" -rm -rf bucts +rm -Rf bucts # Get bucts # ------------------------------------------------------------------------------ diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot index ad358b0d..ab610740 100755 --- a/resources/scripts/helpers/download/coreboot +++ b/resources/scripts/helpers/download/coreboot @@ -32,7 +32,7 @@ printf "Downloading coreboot, patching coreboot and deblobbing coreboot\n" # Remove the old version that may exist # ------------------------------------------------------------------------------ -rm -rf coreboot +rm -Rf coreboot # Get latest coreboot: # ------------------------------------------------------------------------------ @@ -140,7 +140,7 @@ git am ../resources/libreboot/patch/0023-lenovo-x200-Enable-wacom-digitizer-supp # ------------------------------------------------------------------------------ printf "Deleting .git* in coreboot/ (history inside .git contains the blobs that were deleted)\n" -rm -rf .git +rm -Rf .git rm -f .gitreview rm -f .gitmodules rm -f .gitignore diff --git a/resources/scripts/helpers/download/flashrom b/resources/scripts/helpers/download/flashrom index 9a966ee5..093aac8a 100755 --- a/resources/scripts/helpers/download/flashrom +++ b/resources/scripts/helpers/download/flashrom @@ -31,7 +31,7 @@ set -u -e printf "Downloading flashrom\n" -rm -rf flashrom +rm -Rf flashrom # Get flashrom # ------------------------------------------------------------------------------ diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub index 91f97ff1..e35d7318 100755 --- a/resources/scripts/helpers/download/grub +++ b/resources/scripts/helpers/download/grub @@ -31,7 +31,7 @@ set -u -e printf "Downloading GRUB\n" -rm -rf grub +rm -Rf grub # Get latest GRUB # ------------------------------------------------------------------------------ diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus index 99fc3c4c..9fa20dd1 100755 --- a/resources/scripts/helpers/download/memtest86plus +++ b/resources/scripts/helpers/download/memtest86plus @@ -32,7 +32,7 @@ set -u -e printf "Downloading MemTest86+\n" -rm -rf "memtest86+-5.01" +rm -Rf "memtest86+-5.01" # Get latest memtest86+: # ------------------------------------------------------------------------------ diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile index 51d7e0e4..563b43c3 100644 --- a/resources/utilities/ich9deblob/Makefile +++ b/resources/utilities/ich9deblob/Makefile @@ -89,4 +89,4 @@ obj/gbe/gbe.o: # make clean # ---------------------------------------------------------------------- clean: - rm -rf ich9deblob ich9gen demefactory obj/*.o obj/*/*.o + rm -Rf ich9deblob ich9gen demefactory obj/*.o obj/*/*.o -- cgit v1.2.3-70-g09d2