From 8aeb99db6425e94cf3324aacfee20c584415ba5f Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sun, 11 Sep 2016 18:29:28 +0200 Subject: [PATCH] Adapt sample to latest Yunohost example: is_public is now a boolean. As many packages still use a string format, leave the previous is_public specification as a comment Adapt script to permit the use of numbers for is_public value --- check_process | 3 ++- sub_scripts/testing_process.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index a91975e..353c504 100644 --- a/check_process +++ b/check_process @@ -6,7 +6,8 @@ path="/path" (PATH) admin="john" (USER) language="fr" - is_public="Yes" (PUBLIC|public=Yes|private=No) +# is_public="Yes" (PUBLIC|public=Yes|private=No) + is_public=1 (PUBLIC|public=1|private=0) password="pass" (PASSWORD) port="666" (PORT) ; Checks diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh index 3778fe5..3fdd824 100644 --- a/sub_scripts/testing_process.sh +++ b/sub_scripts/testing_process.sh @@ -472,10 +472,10 @@ CHECK_PUBLIC_PRIVATE () { MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_PASSWORD=[a-Z$]*\&/$MANIFEST_PASSWORD=$PASSWORD_TEST\&/") # Choix public/privé if [ "$1" == "private" ]; then - MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_PUBLIC=[a-Z]*\&/$MANIFEST_PUBLIC=$MANIFEST_PUBLIC_private\&/") + MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_PUBLIC=[a-Z0-9]*\&/$MANIFEST_PUBLIC=$MANIFEST_PUBLIC_private\&/") fi if [ "$1" == "public" ]; then - MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_PUBLIC=[a-Z]*\&/$MANIFEST_PUBLIC=$MANIFEST_PUBLIC_public\&/") + MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_PUBLIC=[a-Z0-9]*\&/$MANIFEST_PUBLIC=$MANIFEST_PUBLIC_public\&/") fi if [ "$GLOBAL_CHECK_ROOT" -eq 1 ]; then # Utilise une install root, si elle a fonctionné MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s@$MANIFEST_PATH=[a-Z/$]*\&@$MANIFEST_PATH=/\&@")