YunoHost-Apps/xwiki_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/xwiki_ynh.git synced 2024-09-03 20:36:11 +02:00
Code Issues Activity Actions

Simplify the way to check of install/upgrade flavor and fix typo

Browse source
This commit is contained in:
Josué Tille 2024-05-28 00:44:16 +02:00
parent 650f64beda
commit 22fbacbac1
No known key found for this signature in database
GPG key ID: 5F259226AD51F2F5
1 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/_common.sh
View file

@ -76,7 +76,7 @@ install_exension() {
while true; do while true; do
sleep 5 sleep 5
status_raw=$($curl --user "superadmin:$super_admin_pwd" -X GET -H 'Content-Type: text/xml' "http://127.0.0.1:$port/${path2}rest/jobstatus/extension/provision/$job_id") status_raw=$($curl --user "superadmin:$super_admin_pwd" -X GET -H 'Content-Type: text/xml' "http://127.0.0.1:$port/${path2}rest/jobstatus/extension/action/$job_id")
state_request=$(echo "$status_raw" | $xq -x '//jobStatus/state') state_request=$(echo "$status_raw" | $xq -x '//jobStatus/state')
if [ -z "$state_request" ]; then if [ -z "$state_request" ]; then
@ -96,7 +96,7 @@ install_exension() {
} }
wait_xwiki_started() { wait_xwiki_started() {
local res='meta http-equiv="refresh" content="1"'$ local res='meta http-equiv="refresh" content="1"'
local curl='curl --silent --show-error' local curl='curl --silent --show-error'
while echo "$res" | grep -q 'meta http-equiv="refresh" content="1"'; do while echo "$res" | grep -q 'meta http-equiv="refresh" content="1"'; do
@ -106,31 +106,15 @@ wait_xwiki_started() {
} }
wait_for_flavor_install() { wait_for_flavor_install() {
local flavor_job_id='org.xwiki.platform%3Axwiki-platform-distribution-flavor-mainwiki/wiki%3Axwiki' local status_header
local status_raw
local state_request
local xq=$install_dir/xq_tool/xq
local curl='curl --silent --show-error'
# Need to call main page to start xwiki service # Need to call main page to start xwiki service
wait_xwiki_started wait_xwiki_started
while true; do while true; do
status_raw=$($curl --user "superadmin:$super_admin_pwd" -X GET -H 'Content-Type: text/xml' "http://127.0.0.1:$port/${path2}rest/jobstatus/extension/action/$flavor_job_id") status_header="$(curl --silent --show-error -I "http://127.0.0.1:$port/${path2}bin/view/Main/")"
state_request=$(echo "$status_raw" | $xq -x '//jobStatus/state') if ! echo "$status_header" | grep -q -E 'Location:[[:space:]].*/Distribution\?xredirect='; then
break
if [ -z "$state_request" ]; then
ynh_die --message="Invalid answer: '$status_raw'"
elif [ "$state_request" == FINISHED ]; then
# Check if error happen
error_msg=$(echo "$status_raw" | $xq -x '//jobStatus/errorMessage')
if [ -z "$error_msg" ]; then
break
else
ynh_die --message="Error while installing extension 'org.xwiki.platform%3Axwiki-platform-distribution-flavor-mainwiki'. Error: $error_msg"
fi
elif [ "$state_request" != RUNNING ]; then
ynh_die --message="Invalid status '$state_request'"
fi fi
sleep 10 sleep 10
done done