From 106d29b5ba03e29a4fa6330112abf931a5cb0439 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 19:26:50 +0200 Subject: [PATCH 1/2] adding labriqueinternet as autorized repository --- package_check.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package_check.sh b/package_check.sh index 78ebb6d..b7c404c 100755 --- a/package_check.sh +++ b/package_check.sh @@ -663,16 +663,22 @@ TEST_RESULTS () { # Check the YEP 1.7 (https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-17---ajouter-lapp-%C3%A0-lorganisation-yunohost-apps---valid%C3%A9--manuel--official-) # Default value, YEP 1.7 not checked YEP17=-1 + YEP17_labriqueinternet=-1 if echo "$app_arg" | grep --extended-regexp --quiet "https?:\/\/" then # If the app have been picked from github, check if this app was under the YunoHost-Apps organisation # YEP17 will be equal to 1 if the app was under the YunoHost-Apps organisation YEP17=$(echo "$app_arg" | grep --ignore-case --count "github.com/YunoHost-Apps/") - [ $YEP17 -eq 1 ] || ECHO_FORMAT "This app doesn't respect the YEP 1.7 ! (https://yunohost.org/#/packaging_apps_guidelines_fr)\n" "red" + # If the app have been picked from github, check if this app was under the labriqueinternet organisation + # YEP17_labriqueinternet will be equal to 1 if the app was under the labriqueinternet organisation + YEP17_labriqueinternet=$(echo "$app_arg" | grep --ignore-case --count "github.com/labriqueinternet/") + if ( [ $YEP17 -eq 1 ] && [ $YEP17_labriqueinternet -eq 1 ] ) + then ECHO_FORMAT "This app doesn't respect the YEP 1.7 ! (https://yunohost.org/#/packaging_apps_guidelines_fr)\n" "red" + fi fi # Validated if YEP 1.7 respected - if [ $YEP17 -ne 0 ] + if ( [ $YEP17 -ne 0 ] || [ $YEP17_labriqueinternet -ne 0 ] ) then level[6]=2 else level[6]=0 fi From 8f1239e4f618733ce1d407be075bc29185477ac2 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sat, 1 Jun 2019 19:34:11 +0200 Subject: [PATCH 2/2] Fix conditions --- package_check.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_check.sh b/package_check.sh index b7c404c..6bb640f 100755 --- a/package_check.sh +++ b/package_check.sh @@ -672,13 +672,13 @@ TEST_RESULTS () { # If the app have been picked from github, check if this app was under the labriqueinternet organisation # YEP17_labriqueinternet will be equal to 1 if the app was under the labriqueinternet organisation YEP17_labriqueinternet=$(echo "$app_arg" | grep --ignore-case --count "github.com/labriqueinternet/") - if ( [ $YEP17 -eq 1 ] && [ $YEP17_labriqueinternet -eq 1 ] ) - then ECHO_FORMAT "This app doesn't respect the YEP 1.7 ! (https://yunohost.org/#/packaging_apps_guidelines_fr)\n" "red" - fi + if [ $YEP17 -ne 1 ] && [ $YEP17_labriqueinternet -ne 1 ]; then + ECHO_FORMAT "This app doesn't respect the YEP 1.7 ! (https://yunohost.org/#/packaging_apps_guidelines_fr)\n" "red" + fi fi # Validated if YEP 1.7 respected - if ( [ $YEP17 -ne 0 ] || [ $YEP17_labriqueinternet -ne 0 ] ) + if [ $YEP17 -ne 0 ] && [ $YEP17_labriqueinternet -ne 0 ] then level[6]=2 else level[6]=0 fi