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

'if [[ $(command) ]]' probably doesnt mean what you think it means

Browse source
This commit is contained in:
Alexandre Aubin 2023-12-19 03:12:51 +01:00
parent f472785ac6
commit 4974d91302
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/_common.sh
View file

@ -35,10 +35,7 @@ garage_connect() {
local i=0
until $garage layout show 2>/dev/null | grep "${peer:0:15}"; do
i=$(( i + 1 ))
if [ $i -gt 30 ]
then
ynh_die --message="Unable to get layout from remote peer"
fi
[ $i -le 30 ] || ynh_die --message="Unable to get layout from remote peer"
sleep 1
done
}
@ -46,12 +43,12 @@ garage_connect() {
garage_layout_apply() {
$garage layout show 2>/dev/null
if [ "$($garage layout show | grep 'This new layout cannot yet be applied')" ]
if $garage layout show | grep -q 'This new layout cannot yet be applied'
then
ynh_print_warn --message="Unable to apply layout. No enough nodes"
return 0
else
local layout_version=$($garage layout show 2>/dev/null | grep -Po -- "(?<=--version).*" | head -1 | xargs)
$garage layout apply --version $layout_version
fi
fi
local layout_version=$($garage layout show 2>/dev/null | grep -Po -- "(?<=--version).*" | head -1 | xargs)
$garage layout apply --version $layout_version
}