From cccb58153fc9cfe177bab7cf7bc30000935adff4 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Mon, 27 Nov 2023 13:02:54 +0300 Subject: [PATCH] added "--wait-finish" for occ app_api:app:register (AppAPI 1.3+) Signed-off-by: Alexander Piskun --- scripts/ci_register.sh | 2 +- scripts/dev_register.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci_register.sh b/scripts/ci_register.sh index 32eef1aa..ee135ba8 100755 --- a/scripts/ci_register.sh +++ b/scripts/ci_register.sh @@ -6,4 +6,4 @@ php occ app_api:daemon:register manual_install "Manual Install" manual-install 0 0 0 php occ app_api:app:register "$1" manual_install --json-info \ "{\"appid\":\"$1\",\"name\":\"$1\",\"daemon_config_name\":\"manual_install\",\"version\":\"$2\",\"secret\":\"$3\",\"host\":\"$4\",\"scopes\":{\"required\":[\"SYSTEM\", \"FILES\", \"FILES_SHARING\"],\"optional\":[\"USER_INFO\", \"USER_STATUS\", \"NOTIFICATIONS\", \"WEATHER_STATUS\", \"TALK\", \"TALK_BOT\", \"ACTIVITIES\", \"NOTES\"]},\"port\":$5,\"protocol\":\"http\",\"system_app\":1}" \ - --force-scopes + --force-scopes --wait-finish diff --git a/scripts/dev_register.sh b/scripts/dev_register.sh index 1fd027ac..3afc783c 100644 --- a/scripts/dev_register.sh +++ b/scripts/dev_register.sh @@ -14,7 +14,7 @@ echo $! > /tmp/_install.pid python3 tests/_install_wait.py "http://localhost:9009/heartbeat" "\"status\":\"ok\"" 15 0.5 docker exec "$1" sudo -u www-data php occ app_api:app:register nc_py_api manual_install --json-info \ "{\"appid\":\"nc_py_api\",\"name\":\"nc_py_api\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"scopes\":{\"required\":[\"SYSTEM\", \"FILES\", \"FILES_SHARING\"],\"optional\":[\"USER_INFO\", \"USER_STATUS\", \"NOTIFICATIONS\", \"WEATHER_STATUS\", \"TALK\", \"TALK_BOT\", \"ACTIVITIES\", \"NOTES\"]},\"port\":9009,\"protocol\":\"http\",\"system_app\":1}" \ - --force-scopes + --force-scopes --wait-finish cat /tmp/_install.pid kill -15 "$(cat /tmp/_install.pid)" echo "nc_py_api for $1 is ready to use"