From faf1223548df5ab562264bc48583ed91b5329e7e Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Sat, 9 Dec 2023 11:44:01 +0100 Subject: [PATCH 1/2] cp -f compatible with Mac --- ci/ocm-test-suite.sh | 4 ++-- release/federatedgroups-owncloud.sh | 2 +- release/ocm-owncloud.sh | 2 +- release/sciencemesh-nextcloud.sh | 2 +- release/sciencemesh-owncloud.sh | 2 +- tests/base-nextcloud.sh | 2 +- tests/base-owncloud.sh | 2 +- tests/ocm-test-suite.sh | 4 ++-- tests/rd-sram.sh | 2 +- tests/sciencemesh.sh | 4 ++-- tests/sm-sram-ocm.sh | 2 +- tests/surf-trashbin.sh | 2 +- tests/testing-ocm-nc-oc.sh | 4 ++-- tests/testing-ocm.sh | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ci/ocm-test-suite.sh b/ci/ocm-test-suite.sh index f8145b82..2ac8895c 100755 --- a/ci/ocm-test-suite.sh +++ b/ci/ocm-test-suite.sh @@ -45,8 +45,8 @@ function waitForPort () { [ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp" # copy init files. -cp --force ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh -cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh +cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh +cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh docker run --detach --network=testnet \ --name=meshdir.docker \ diff --git a/release/federatedgroups-owncloud.sh b/release/federatedgroups-owncloud.sh index 505d3333..a6664e02 100755 --- a/release/federatedgroups-owncloud.sh +++ b/release/federatedgroups-owncloud.sh @@ -14,7 +14,7 @@ BRANCH_OWNCLOUD_APP=release [ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp" # copy init files. -cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${REPO_ROOT}/temp/oc-rd-sram.sh" +cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${REPO_ROOT}/temp/oc-rd-sram.sh" # ownCloud federatedgroups source code. [ ! -d "rd-sram-release" ] && \ diff --git a/release/ocm-owncloud.sh b/release/ocm-owncloud.sh index c18e0df3..66ec4501 100755 --- a/release/ocm-owncloud.sh +++ b/release/ocm-owncloud.sh @@ -14,7 +14,7 @@ BRANCH_OWNCLOUD_APP=release [ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp" # copy init files. -cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh" +cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh" # ownCloud opencloudmesh source code. [ ! -d "oc-ocm-release" ] && \ diff --git a/release/sciencemesh-nextcloud.sh b/release/sciencemesh-nextcloud.sh index 6efe0548..8078fb10 100755 --- a/release/sciencemesh-nextcloud.sh +++ b/release/sciencemesh-nextcloud.sh @@ -13,7 +13,7 @@ BRANCH_OWNCLOUD_APP=nextcloud [ ! -d "temp" ] && mkdir -p temp # copy init file. -cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nc.sh +cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nc.sh # add additional tagging for docker images. docker tag pondersource/dev-stock-nextcloud-sciencemesh pondersource/dev-stock-nc1-sciencemesh diff --git a/release/sciencemesh-owncloud.sh b/release/sciencemesh-owncloud.sh index 603cced7..a77f5669 100755 --- a/release/sciencemesh-owncloud.sh +++ b/release/sciencemesh-owncloud.sh @@ -13,7 +13,7 @@ BRANCH_OWNCLOUD_APP=owncloud [ ! -d "temp" ] && mkdir -p temp # copy init file. -cp --force ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/oc.sh +cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/oc.sh # add additional tagging for docker images. docker tag pondersource/dev-stock-owncloud-sciencemesh pondersource/dev-stock-oc1-sciencemesh diff --git a/tests/base-nextcloud.sh b/tests/base-nextcloud.sh index ba138e85..bb8c6c52 100755 --- a/tests/base-nextcloud.sh +++ b/tests/base-nextcloud.sh @@ -35,7 +35,7 @@ function waitForPort () { [ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp" # copy init files. -cp --force "${ENV_ROOT}/docker/scripts/init-nextcloud.sh" "${ENV_ROOT}/temp/nc-base.sh" +cp -f "${ENV_ROOT}/docker/scripts/init-nextcloud.sh" "${ENV_ROOT}/temp/nc-base.sh" # echo "starting firefox tester" docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest diff --git a/tests/base-owncloud.sh b/tests/base-owncloud.sh index 9a8506d5..63f8c3be 100755 --- a/tests/base-owncloud.sh +++ b/tests/base-owncloud.sh @@ -35,7 +35,7 @@ function waitForPort () { [ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp" # copy init files. -cp --force "${ENV_ROOT}/docker/scripts/init-owncloud.sh" "${ENV_ROOT}/temp/oc-base.sh" +cp -f "${ENV_ROOT}/docker/scripts/init-owncloud.sh" "${ENV_ROOT}/temp/oc-base.sh" echo "starting firefox tester" docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest diff --git a/tests/ocm-test-suite.sh b/tests/ocm-test-suite.sh index d07be178..b0c7db2c 100755 --- a/tests/ocm-test-suite.sh +++ b/tests/ocm-test-suite.sh @@ -49,8 +49,8 @@ function waitForCollabora { [ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp" # copy init files. -cp --force ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh -cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh +cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh +cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh sudo rm --force --recursive "${ENV_ROOT}/temp/.X11-unix" docker run --detach --name=meshdir.docker --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub diff --git a/tests/rd-sram.sh b/tests/rd-sram.sh index aa419bbb..409b4ce5 100755 --- a/tests/rd-sram.sh +++ b/tests/rd-sram.sh @@ -38,7 +38,7 @@ function waitForPort () { [ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp" # copy init files. -cp --force "${ENV_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${ENV_ROOT}/temp/oc-rd-sram.sh" +cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-rd-sram.sh" "${ENV_ROOT}/temp/oc-rd-sram.sh" docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest docker run --detach --name=firefox-legacy --network=testnet -p 5900:5800 --shm-size 2g jlesage/firefox:v1.18.0 diff --git a/tests/sciencemesh.sh b/tests/sciencemesh.sh index 19cb0c8a..1bf3e02b 100755 --- a/tests/sciencemesh.sh +++ b/tests/sciencemesh.sh @@ -46,8 +46,8 @@ function waitForCollabora { [ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp" # copy init files. -cp --force ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh -cp --force ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh +cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh +cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh docker run --detach --name=meshdir.docker --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest diff --git a/tests/sm-sram-ocm.sh b/tests/sm-sram-ocm.sh index 1c2cc66d..6b403b3a 100755 --- a/tests/sm-sram-ocm.sh +++ b/tests/sm-sram-ocm.sh @@ -49,7 +49,7 @@ function waitForCollabora { [ ! -d "${ENV_ROOT}/temp" ] && mkdir --parents "${ENV_ROOT}/temp" # copy init files. -cp --force ./docker/scripts/init-owncloud-sm-sram-ocm.sh ./temp/owncloud.sh +cp -f ./docker/scripts/init-owncloud-sm-sram-ocm.sh ./temp/owncloud.sh docker run --detach --name=meshdir.docker --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest diff --git a/tests/surf-trashbin.sh b/tests/surf-trashbin.sh index 6e39e165..fb71f108 100755 --- a/tests/surf-trashbin.sh +++ b/tests/surf-trashbin.sh @@ -35,7 +35,7 @@ function waitForPort () { [ ! -d "${ENV_ROOT}/temp" ] && mkdir -p "${ENV_ROOT}/temp" # copy init files. -cp --force "${ENV_ROOT}/docker/scripts/init-owncloud-surf-trashbin.sh" "${ENV_ROOT}/temp/oc-surf-trashbin.sh" +cp -f "${ENV_ROOT}/docker/scripts/init-owncloud-surf-trashbin.sh" "${ENV_ROOT}/temp/oc-surf-trashbin.sh" echo "starting firefox tester" docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest diff --git a/tests/testing-ocm-nc-oc.sh b/tests/testing-ocm-nc-oc.sh index 298f78f3..54a974f1 100755 --- a/tests/testing-ocm-nc-oc.sh +++ b/tests/testing-ocm-nc-oc.sh @@ -22,8 +22,8 @@ function waitForPort { [ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp" # copy init files. -cp --force "${REPO_ROOT}/docker/scripts/init-nextcloud.sh" "${REPO_ROOT}/temp/nc-base.sh" -cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh" +cp -f "${REPO_ROOT}/docker/scripts/init-nextcloud.sh" "${REPO_ROOT}/temp/nc-base.sh" +cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh" echo "starting firefox tester" docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest diff --git a/tests/testing-ocm.sh b/tests/testing-ocm.sh index a5c00a2a..682e3b28 100755 --- a/tests/testing-ocm.sh +++ b/tests/testing-ocm.sh @@ -22,7 +22,7 @@ function waitForPort { [ ! -d "${REPO_ROOT}/temp" ] && mkdir -p "${REPO_ROOT}/temp" # copy init files. -cp --force "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh" +cp -f "${REPO_ROOT}/docker/scripts/init-owncloud-opencloudmesh.sh" "${REPO_ROOT}/temp/oc-opencloudmesh.sh" echo "starting firefox tester" docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest From e52f01eced96225aa2949a08e0d44a3891d66c9b Mon Sep 17 00:00:00 2001 From: Michiel de Jong Date: Sat, 9 Dec 2023 11:45:02 +0100 Subject: [PATCH 2/2] rm -rf compatible with Mac --- tests/ocm-test-suite.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ocm-test-suite.sh b/tests/ocm-test-suite.sh index b0c7db2c..6e9e8197 100755 --- a/tests/ocm-test-suite.sh +++ b/tests/ocm-test-suite.sh @@ -51,7 +51,7 @@ function waitForCollabora { # copy init files. cp -f ./docker/scripts/init-owncloud-sciencemesh.sh ./temp/owncloud.sh cp -f ./docker/scripts/init-nextcloud-sciencemesh.sh ./temp/nextcloud.sh -sudo rm --force --recursive "${ENV_ROOT}/temp/.X11-unix" +sudo rm -rf "${ENV_ROOT}/temp/.X11-unix" docker run --detach --name=meshdir.docker --network=testnet -v "${ENV_ROOT}/docker/scripts/stub.js:/ocm-stub/stub.js" pondersource/dev-stock-ocmstub docker run --detach --name=firefox --network=testnet -p 5800:5800 --shm-size 2g jlesage/firefox:latest