Skip to content

Commit

Permalink
Use 'cp -rf' everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
@KA2107
KA2107 committed Apr 27, 2012
1 parent 04b09fc commit ff28858
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 22 deletions.
10 changes: 5 additions & 5 deletions grub/compile_grub.sh
View file
Expand Up @@ -64,13 +64,13 @@ _CLEAN_GRUB_SRCDIR() {

echo

cp -r "${_WD_OUTER}/${_GRUB_SRCDIR}/.git" "${_WD_OUTER}/.git_grub_src"
cp -rf "${_WD_OUTER}/${_GRUB_SRCDIR}/.git" "${_WD_OUTER}/.git_grub_src"
rm -rf "${_WD_OUTER}/${_GRUB_SRCDIR}"/* || true
rm -rf "${_WD_OUTER}/${_GRUB_SRCDIR}"/.* || true
echo

if [[ ! -d "${_WD_OUTER}/${_GRUB_SRCDIR}/.git" ]]; then
cp -r "${_WD_OUTER}/.git_grub_src" "${_WD_OUTER}/${_GRUB_SRCDIR}/.git"
cp -rf "${_WD_OUTER}/.git_grub_src" "${_WD_OUTER}/${_GRUB_SRCDIR}/.git"
fi
echo

Expand Down Expand Up @@ -104,7 +104,7 @@ _COMPILE_GRUB() {
_CLEAN_GRUB_SRCDIR
echo

cp -r "${_WD_OUTER}/grub_extras__GIT_BZR" "${_WD_OUTER}/${_GRUB_SRCDIR}/grub_extras__GIT_BZR" || true
cp -rf "${_WD_OUTER}/grub_extras__GIT_BZR" "${_WD_OUTER}/${_GRUB_SRCDIR}/grub_extras__GIT_BZR" || true
# rm -rf "${_WD_OUTER}/${_GRUB_SRCDIR}/grub_extras__GIT_BZR/lua" || true
rm -rf "${_WD_OUTER}/${_GRUB_SRCDIR}/grub_extras__GIT_BZR/gpxe" || true
echo
Expand Down Expand Up @@ -148,7 +148,7 @@ if [[ "${_PROCESS_CONTINUE_UEFI}" == 'TRUE' ]]; then

echo

cp -r "${_WD_OUTER}/${_GRUB_SRCDIR}/GRUB_UEFI_BUILD_DIR_x86_64" "${_WD_OUTER}/GRUB_UEFI_BUILD_DIR_x86_64" || true
cp -rf "${_WD_OUTER}/${_GRUB_SRCDIR}/GRUB_UEFI_BUILD_DIR_x86_64" "${_WD_OUTER}/GRUB_UEFI_BUILD_DIR_x86_64" || true
rm -rf "${_WD_OUTER}/${_GRUB_SRCDIR}/GRUB_UEFI_BUILD_DIR_x86_64" || true

echo
Expand All @@ -173,7 +173,7 @@ if [[ "${_PROCESS_CONTINUE_BIOS}" == 'TRUE' ]]; then

echo

cp -r "${_WD_OUTER}/${_GRUB_BIOS_SRCDIR}/GRUB_BIOS_BUILD_DIR" "${_WD_OUTER}/GRUB_BIOS_BUILD_DIR" || true
cp -rf "${_WD_OUTER}/${_GRUB_BIOS_SRCDIR}/GRUB_BIOS_BUILD_DIR" "${_WD_OUTER}/GRUB_BIOS_BUILD_DIR" || true
rm -rf "${_WD_OUTER}/${_GRUB_BIOS_SRCDIR}/GRUB_BIOS_BUILD_DIR" || true

echo
Expand Down
2 changes: 1 addition & 1 deletion my_files.sh
View file
Expand Up @@ -410,7 +410,7 @@ _REFIND_UEFI() {

sudo install -D -m0644 "${_UEFI_SYS_PART_DIR}/arch/refind/refindx64.efi" "${_UEFI_SYS_PART_DIR}/boot/bootx64.efi"
sudo install -D -m0644 "${_UEFI_SYS_PART_DIR}/arch/refind/refind.conf" "${_UEFI_SYS_PART_DIR}/boot/refind.conf"
sudo cp -r "${_UEFI_SYS_PART_DIR}/arch/refind/icons" "${_UEFI_SYS_PART_DIR}/boot/icons"
sudo cp -rf "${_UEFI_SYS_PART_DIR}/arch/refind/icons" "${_UEFI_SYS_PART_DIR}/boot/icons"

echo

Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/duetpkg_bootsectors_udk_linux_compile.sh
View file
Expand Up @@ -54,7 +54,7 @@ _COMPILE_DUETPKG_BOOTSECTOR() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_BOOTSECTOR_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_BOOTSECTOR_BUILD_DIR}"

echo

Expand Down
4 changes: 2 additions & 2 deletions tianocore_uefi/duetpkg_x86_64_create_memdisk_old.sh
View file
Expand Up @@ -34,7 +34,7 @@ _CREATE_FLOPPY_MEMDISK_EMUVARIABLE() {
echo

mkdir -p "${_UDK_BUILD_OUTER_DIR}"
cp -r "${_DUETPKG_EMUVARIABLE_BUILD_DIR}" "${_UDK_BUILD_DIR}"
cp -rf "${_DUETPKG_EMUVARIABLE_BUILD_DIR}" "${_UDK_BUILD_DIR}"

echo

Expand Down Expand Up @@ -85,7 +85,7 @@ _CREATE_FLOPPY_MEMDISK_FSVARIABLE() {
echo

mkdir -p "${_UDK_BUILD_OUTER_DIR}"
cp -r "${_DUETPKG_FSVARIABLE_BUILD_DIR}" "${_UDK_BUILD_DIR}"
cp -rf "${_DUETPKG_FSVARIABLE_BUILD_DIR}" "${_UDK_BUILD_DIR}"

echo

Expand Down
4 changes: 2 additions & 2 deletions tianocore_uefi/duetpkg_x86_64_post_compile_setup_git_repos.sh
View file
Expand Up @@ -117,7 +117,7 @@ _UEFI_DUET_INSTALLER_GIT() {

rm -rf "${_UEFI_DUET_INSTALLER_DIR}/Linux_Source" || true
mkdir -p "${_UEFI_DUET_INSTALLER_DIR}/Linux_Source"
cp -r "${_UDK_C_SOURCE_DIR}" "${_UEFI_DUET_INSTALLER_DIR}/Linux_Source/C"
cp -rf "${_UDK_C_SOURCE_DIR}" "${_UEFI_DUET_INSTALLER_DIR}/Linux_Source/C"
# chmod -R -x "${_UEFI_DUET_INSTALLER_DIR}/Linux_Source/C" || true

echo
Expand Down Expand Up @@ -190,7 +190,7 @@ _DUET_MEMDISK_TOOLS_GIT() {

rm -rf "${_DUET_MEMDISK_TOOLS_DIR}/Linux_Source" || true
mkdir -p "${_DUET_MEMDISK_TOOLS_DIR}/Linux_Source"
cp -r "${_UDK_C_SOURCE_DIR}" "${_DUET_MEMDISK_TOOLS_DIR}/Linux_Source/C"
cp -rf "${_UDK_C_SOURCE_DIR}" "${_DUET_MEMDISK_TOOLS_DIR}/Linux_Source/C"
# chmod -R -x "${_DUET_MEMDISK_TOOLS_DIR}/Linux_Source/C" || true

echo
Expand Down
4 changes: 2 additions & 2 deletions tianocore_uefi/duetpkg_x86_64_udk_linux_compile.sh
View file
Expand Up @@ -42,7 +42,7 @@ _COMPILE_DUETPKG_EMUVARIABLE_BRANCH() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_DUETPKG_EMUVARIABLE_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_DUETPKG_EMUVARIABLE_BUILD_DIR}"
install -D -m0644 "${_UDK_BUILD_OUTER_DIR}/floppy.img" "${_DUETPKG_EMUVARIABLE_BUILD_DIR}/floppy.img"

echo
Expand Down Expand Up @@ -95,7 +95,7 @@ _COMPILE_DUETPKG_FSVARIABLE_BRANCH() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_DUETPKG_FSVARIABLE_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_DUETPKG_FSVARIABLE_BUILD_DIR}"
install -D -m0644 "${_UDK_BUILD_OUTER_DIR}/floppy.img" "${_DUETPKG_FSVARIABLE_BUILD_DIR}/floppy.img"

echo
Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/edkcompatibilitypkg_x86_64_udk_linux_compile.sh
View file
Expand Up @@ -50,7 +50,7 @@ _COMPILE_EDKCOMPATIBILITYPKG() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_EDKCOMPATIBILITYPKG_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_EDKCOMPATIBILITYPKG_BUILD_DIR}"

echo

Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/emulatorpkg_unix_x86_64_udk_linux_compile.sh
View file
Expand Up @@ -47,7 +47,7 @@ _COMPILE_EMULATORPKG_UNIX_X86_64() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_EMULATORPKG_UNIX_X86_64_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_EMULATORPKG_UNIX_X86_64_DIR}"

echo

Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/iso9660_virtualbox_x86_64_udk_linux_compile.sh
View file
Expand Up @@ -73,7 +73,7 @@ _COMPILE_ISO9660() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_ISO9660_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_ISO9660_BUILD_DIR}"

echo

Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/mdepkg_x86_64_udk_linux_compile.sh
View file
Expand Up @@ -50,7 +50,7 @@ _COMPILE_MDEPKG() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_MDEPKG_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_MDEPKG_BUILD_DIR}"

echo

Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/ovmfpkg_x86_64_udk_linux_compile.sh
View file
Expand Up @@ -47,7 +47,7 @@ _COMPILE_OVMFPKG() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_OVMFPKG_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_OVMFPKG_BUILD_DIR}"

echo

Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/shellpkg_x86_64_udk_linux_compile.sh
View file
Expand Up @@ -50,7 +50,7 @@ _COMPILE_SHELLPKG() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_SHELLPKG_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_SHELLPKG_BUILD_DIR}"

echo

Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/stdlib_x86_64_udk_linux_compile.sh
View file
Expand Up @@ -50,7 +50,7 @@ _COMPILE_STDLIB() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_STDLIB_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_STDLIB_BUILD_DIR}"

echo

Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/tianocore_uefi_common.sh
View file
Expand Up @@ -70,7 +70,7 @@ _COPY_BUILDTOOLS_BASETOOLS() {

echo

cp -r "${_UDK_BUILD_TOOLS_DIR}" "${EDK_TOOLS_PATH}"
cp -rf "${_UDK_BUILD_TOOLS_DIR}" "${EDK_TOOLS_PATH}"

echo

Expand Down
2 changes: 1 addition & 1 deletion tianocore_uefi/unixpkg_x86_64_udk_linux_compile.sh
View file
Expand Up @@ -47,7 +47,7 @@ _COMPILE_UNIXPKG() {

echo

cp -r "${_UDK_BUILD_DIR}" "${_UNIXPKG_BUILD_DIR}"
cp -rf "${_UDK_BUILD_DIR}" "${_UNIXPKG_BUILD_DIR}"

echo

Expand Down

0 comments on commit ff28858

Please sign in to comment.