diff --git a/scripts/install b/scripts/install index 12c3a59..dcdb8be 100644 --- a/scripts/install +++ b/scripts/install @@ -82,21 +82,24 @@ sandboxdomain=sandbox-$domain #================================================= # CHECK IF CRYPTAD_SANDBOX IS INSTALLED, IF NOT INSTALL IT #================================================= -ynh_script_progression --message="Installing Cryptpad Sandboxing App if needed..." --weight=18 +# We don't test that in CI +if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + ynh_script_progression --message="Installing Cryptpad Sandboxing App if needed..." --weight=18 -if ! yunohost app list | grep -q "id: cryptpad_sandboxing"; then - echo "Cryptpad Sandboxing App is not installed. Installing... " - yunohost tools update - if yunohost app list | grep -q "$sandboxdomain"; then - ynh_die "The domain $sandboxdomain provided for Cryptpad Sandboxing App is already used by another app. Please chose another one !" - fi - public=public - if [ $is_public -eq 1 ]; then - #yunohost app install https://github.com/YunoHost-Apps/cryptpad_sandboxing_ynh --force --args "domain=$sandboxdomain&porti=$porti&cryptpad_domain=$domain&is_$public=true" - yunohost app install https://github.com/Ddataa/cryptpad_sandboxing_ynh/tree/testing --force --args "domain=$sandboxdomain&porti=$porti&cryptpad_domain=$domain&is_$public=true" - else - #yunohost app install https://github.com/YunoHost-Apps/cryptpad_sandboxing_ynh --force --args "domain=$sandboxdomain&porti=$porti&cryptpad_domain=$domain&is_$public=false" - yunohost app install https://github.com/Ddataa/cryptpad_sandboxing_ynh/tree/testing --force --args "domain=$sandboxdomain&porti=$porti&cryptpad_domain=$domain&is_$public=false" + if ! yunohost app list | grep -q "id: cryptpad_sandboxing"; then + echo "Cryptpad Sandboxing App is not installed. Installing... " + yunohost tools update + if yunohost app list | grep -q "$sandboxdomain"; then + ynh_die "The domain $sandboxdomain provided for Cryptpad Sandboxing App is already used by another app. Please chose another one !" + fi + public=public + if [ $is_public -eq 1 ]; then + #yunohost app install https://github.com/YunoHost-Apps/cryptpad_sandboxing_ynh --force --args "domain=$sandboxdomain&porti=$porti&cryptpad_domain=$domain&is_$public=true" + yunohost app install https://github.com/Ddataa/cryptpad_sandboxing_ynh/tree/testing --force --args "domain=$sandboxdomain&porti=$porti&cryptpad_domain=$domain&is_$public=true" + else + #yunohost app install https://github.com/YunoHost-Apps/cryptpad_sandboxing_ynh --force --args "domain=$sandboxdomain&porti=$porti&cryptpad_domain=$domain&is_$public=false" + yunohost app install https://github.com/Ddataa/cryptpad_sandboxing_ynh/tree/testing --force --args "domain=$sandboxdomain&porti=$porti&cryptpad_domain=$domain&is_$public=false" + fi fi fi