diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh index a3ba5d8..1ec9eb9 100755 --- a/docker-builder-data/build/script/common/manager.sh +++ b/docker-builder-data/build/script/common/manager.sh @@ -103,12 +103,12 @@ copy() { return 1 fi if [ "$(ls -A $1)" ]; then - if ! cp -rlfP $1/* "$2/"; then + if ! cp --remove-destination -rlP $1/* "$2/"; then return 1 fi fi elif [ -f "$1" ]; then - if ! (mkdir -p `dirname $2` && cp -l "$1" "$2"); then + if ! (mkdir -p `dirname $2` && cp --remove-destination -l "$1" "$2"); then return 1 fi else @@ -200,11 +200,11 @@ prepare_build() { } prepare_install() { - cp -f $BUILD_PACKET_DIR/version-* "$INSTALL_PACKET_DIR/" || true + cp --remove-destination $BUILD_PACKET_DIR/version-* "$INSTALL_PACKET_DIR/" || true } prepare_install_release() { - cp -f $INSTALL_PACKET_DIR/version-* "$INSTALL_RELEASE_PACKET_DIR/" || true + cp --remove-destination $INSTALL_PACKET_DIR/version-* "$INSTALL_RELEASE_PACKET_DIR/" || true } set_environment_vars() { diff --git a/docker-builder-data/build/script/packet/appimagekit-master.sh b/docker-builder-data/build/script/packet/appimagekit-master.sh index 95d0ff3..77e3649 100644 --- a/docker-builder-data/build/script/packet/appimagekit-master.sh +++ b/docker-builder-data/build/script/packet/appimagekit-master.sh @@ -22,8 +22,9 @@ pkbuild() { pkinstall() { mkdir -p "$INSTALL_PACKET_DIR/bin" - if ! (cp -f "$BUILD_PACKET_DIR/$PK_DIRNAME/AppImageAssistant" "$INSTALL_PACKET_DIR/bin/" \ - && cp -f "$BUILD_PACKET_DIR/$PK_DIRNAME/AppRun" "$INSTALL_PACKET_DIR/bin/"); then + if ! (cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/AppImageAssistant" "$INSTALL_PACKET_DIR/bin/" \ + && cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/AppRun" "$INSTALL_PACKET_DIR/bin/" \ + && cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/desktopintegration" "$INSTALL_PACKET_DIR/bin/"); then return 1 fi } diff --git a/docker-builder-data/build/script/packet/blas-3.6.0.sh b/docker-builder-data/build/script/packet/blas-3.6.0.sh index 12fbbea..fffb38e 100644 --- a/docker-builder-data/build/script/packet/blas-3.6.0.sh +++ b/docker-builder-data/build/script/packet/blas-3.6.0.sh @@ -16,7 +16,7 @@ pkbuild() { pkinstall() { mkdir -p "$INSTALL_PACKET_DIR/lib" - if ! cp -r "$BUILD_PACKET_DIR/$PK_DIRNAME/blas_LINUX.a" "$INSTALL_PACKET_DIR/lib/libblas.a"; then + if ! cp --remove-destination -r "$BUILD_PACKET_DIR/$PK_DIRNAME/blas_LINUX.a" "$INSTALL_PACKET_DIR/lib/libblas.a"; then return 1 fi } diff --git a/docker-builder-data/build/script/packet/opentoonz-appimage.sh b/docker-builder-data/build/script/packet/opentoonz-appimage.sh index 33a91e2..a11226a 100644 --- a/docker-builder-data/build/script/packet/opentoonz-appimage.sh +++ b/docker-builder-data/build/script/packet/opentoonz-appimage.sh @@ -8,19 +8,19 @@ pkinstall() { local APPDIR="$INSTALL_PACKET_DIR/$PK_APPDIR_NAME.AppDir" mkdir -p "$APPDIR/usr/lib" - if ! cp "$ENVDEPS_PACKET_DIR/bin/AppRun" "$APPDIR/"; then + if ! cp --remove-destination "$ENVDEPS_PACKET_DIR/bin/AppRun" "$APPDIR/"; then return 1 fi - if ! (cp "$FILES_PACKET_DIR/opentoonz.desktop" "$APPDIR/" \ - && cp "$FILES_PACKET_DIR/opentoonz.png" "$APPDIR/"); then + if ! (cp --remove-destination "$FILES_PACKET_DIR/opentoonz.desktop" "$APPDIR/" \ + && cp --remove-destination "$FILES_PACKET_DIR/opentoonz.png" "$APPDIR/"); then return 1 fi - if ! (cp -f /lib/x86_64-linux-gnu/libudev.so* "$APPDIR/usr/lib/" \ - || cp -f /lib/i386-linux-gnu/libudev.so* "$APPDIR/usr/lib/"); then + if ! (cp --remove-destination /lib/x86_64-linux-gnu/libudev.so* "$APPDIR/usr/lib/" \ + || cp --remove-destination /lib/i386-linux-gnu/libudev.so* "$APPDIR/usr/lib/"); then return 1 fi - if ! (cp -f /usr/lib/x86_64-linux-gnu/libgfortran.so* "$APPDIR/usr/lib/" \ - || cp -f /usr/lib/i386-linux-gnu/libgfortran.so* "$APPDIR/usr/lib/"); then + if ! (cp --remove-destination /usr/lib/x86_64-linux-gnu/libgfortran.so* "$APPDIR/usr/lib/" \ + || cp --remove-destination /usr/lib/i386-linux-gnu/libgfortran.so* "$APPDIR/usr/lib/"); then return 1 fi diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh index 6dcc853..e09ab86 100644 --- a/docker-builder-data/build/script/packet/opentoonz-master.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.sh @@ -52,13 +52,13 @@ pkinstall() { if ! make install; then return 1 fi - if ! cp -f "$FILES_PACKET_DIR/launch-opentoonz.sh" "$INSTALL_PACKET_DIR/bin"; then + if ! cp --remove-destination "$FILES_PACKET_DIR/launch-opentoonz.sh" "$INSTALL_PACKET_DIR/bin"; then return 1 fi - if ! cp -f $BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.so* "$INSTALL_PACKET_DIR/lib"; then + if ! cp --remove-destination $BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.so* "$INSTALL_PACKET_DIR/lib"; then return 1 fi - if ! cp -f $BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiffxx.so* "$INSTALL_PACKET_DIR/lib"; then + if ! cp --remove-destination $BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiffxx.so* "$INSTALL_PACKET_DIR/lib"; then return 1 fi } diff --git a/docker-builder-data/build/script/packet/superlu-4.3.sh b/docker-builder-data/build/script/packet/superlu-4.3.sh index 3b879b5..4e4687e 100644 --- a/docker-builder-data/build/script/packet/superlu-4.3.sh +++ b/docker-builder-data/build/script/packet/superlu-4.3.sh @@ -21,7 +21,7 @@ pkbuild() { } pkinstall() { - if ! cp -r "$BUILD_PACKET_DIR/$PK_DIRNAME/lib" "$INSTALL_PACKET_DIR"; then + if ! cp --remove-destination -r "$BUILD_PACKET_DIR/$PK_DIRNAME/lib" "$INSTALL_PACKET_DIR"; then return 1 fi }