From 37a4ad44d22590b5b9ed7790e39111d8aab5a7da Mon Sep 17 00:00:00 2001 From: sgschantz Date: Thu, 27 Jul 2023 11:54:59 +0700 Subject: [PATCH] specify mac cp for -R --- ios/samples/build_common.sh | 2 +- mac/Keyman4MacIM/localdeploy.sh | 2 +- mac/Keyman4MacIM/make-km-dmg.sh | 2 +- mac/setup/build.sh | 4 ++-- oem/firstvoices/ios/build_common.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/samples/build_common.sh b/ios/samples/build_common.sh index c3397e29b4..e1ed7ee95f 100755 --- a/ios/samples/build_common.sh +++ b/ios/samples/build_common.sh @@ -129,7 +129,7 @@ if [ $DO_UPDATE = true ]; then fi # Copy resources. - cp -Rf "$KEYMAN_ENGINE_FRAMEWORK_SRC" "$KEYMAN_ENGINE_FRAMEWORK_DST" + /bin/cp -Rf "$KEYMAN_ENGINE_FRAMEWORK_SRC" "$KEYMAN_ENGINE_FRAMEWORK_DST" fi if [ $CODE_SIGN = true ]; then diff --git a/mac/Keyman4MacIM/localdeploy.sh b/mac/Keyman4MacIM/localdeploy.sh index 6b56f7fc3e..b09bf36bf6 100755 --- a/mac/Keyman4MacIM/localdeploy.sh +++ b/mac/Keyman4MacIM/localdeploy.sh @@ -42,7 +42,7 @@ if [[ -d "$KM4MIM_INSTALL_PATH" ]]; then rm -Rf "$KM4MIM_INSTALL_PATH" fi echo "Copying $KM4MIM_APP_PATH to $IMLIBRARY_PATH..." -cp -R "$KM4MIM_APP_PATH" "$IMLIBRARY_PATH" +/bin/cp -R "$KM4MIM_APP_PATH" "$IMLIBRARY_PATH" if [[ -d "$KM4MIM_INSTALL_PATH" ]]; then exit 0 diff --git a/mac/Keyman4MacIM/make-km-dmg.sh b/mac/Keyman4MacIM/make-km-dmg.sh index 645abb72ed..b79f40e8b4 100755 --- a/mac/Keyman4MacIM/make-km-dmg.sh +++ b/mac/Keyman4MacIM/make-km-dmg.sh @@ -174,7 +174,7 @@ displayInfo "Copying files from \"$SOURCE_KM_APP\"..." find "$DEST_KM_APP" -mindepth 1 -maxdepth 1 echo "---------" find "$DEST_KM_APP" -mindepth 1 -maxdepth 1 -print0 | xargs -0 rm -rf -cp -fR "$SOURCE_KM_APP/" "$DEST_KM_APP" +/bin/cp -fR "$SOURCE_KM_APP/" "$DEST_KM_APP" echo "---- Listing info in /Volumes/Keyman/ ----" echo "DEST_KM_APP=$DEST_KM_APP" diff --git a/mac/setup/build.sh b/mac/setup/build.sh index 11fbb66df8..40860222da 100755 --- a/mac/setup/build.sh +++ b/mac/setup/build.sh @@ -62,10 +62,10 @@ mkdir -p "$TARGETPATH" rm -rf "$TARGETAPP" || true # Copy new install image to output folder -cp -R "$SOURCEAPP" "$TARGETPATH/" +/bin/cp -R "$SOURCEAPP" "$TARGETPATH/" # Copy Keyman.app into install image -cp -R "$KEYMANAPP" "$TARGETAPP/Contents/MacOS/Keyman.app" +/bin/cp -R "$KEYMANAPP" "$TARGETAPP/Contents/MacOS/Keyman.app" # Copy textinputsource into install image cp textinputsource/textinputsource "$TARGETAPP/Contents/MacOS/textinputsource" diff --git a/oem/firstvoices/ios/build_common.sh b/oem/firstvoices/ios/build_common.sh index 94e318ca7e..04c5ee24ce 100755 --- a/oem/firstvoices/ios/build_common.sh +++ b/oem/firstvoices/ios/build_common.sh @@ -154,7 +154,7 @@ if [ $DO_UPDATE = true ]; then fi # Copy resources. - cp -Rf "$KEYMAN_ENGINE_FRAMEWORK_SRC" "$KEYMAN_ENGINE_FRAMEWORK_DST" + /bin/cp -Rf "$KEYMAN_ENGINE_FRAMEWORK_SRC" "$KEYMAN_ENGINE_FRAMEWORK_DST" fi # First things first - update our dependencies.