Skip to content

Commit 33141a6

Browse files
authored
added "--wait-finish" for occ app_api:app:register (AppAPI 1.3+) (#166)
Adjustments to nc_py_api API if needed will come later, this PR should make pass test here: nextcloud/app_api#128 Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
1 parent 93b0f73 commit 33141a6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

scripts/ci_register.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
php occ app_api:daemon:register manual_install "Manual Install" manual-install 0 0 0
77
php occ app_api:app:register "$1" manual_install --json-info \
88
"{\"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}" \
9-
--force-scopes
9+
--force-scopes --wait-finish

scripts/dev_register.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo $! > /tmp/_install.pid
1414
python3 tests/_install_wait.py "http://localhost:9009/heartbeat" "\"status\":\"ok\"" 15 0.5
1515
docker exec "$1" sudo -u www-data php occ app_api:app:register nc_py_api manual_install --json-info \
1616
"{\"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}" \
17-
--force-scopes
17+
--force-scopes --wait-finish
1818
cat /tmp/_install.pid
1919
kill -15 "$(cat /tmp/_install.pid)"
2020
echo "nc_py_api for $1 is ready to use"

0 commit comments

Comments
 (0)