From e3b5ab68c8772c2784a933e973d1216104996186 Mon Sep 17 00:00:00 2001 From: Ludovic <54670129+lbr38@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:08:41 +0200 Subject: [PATCH] patch --- mods-available/agent/reposerver.agent | 6 +++--- mods-available/reposerver.mod | 7 ++++--- version | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mods-available/agent/reposerver.agent b/mods-available/agent/reposerver.agent index 6e7eec3..d901d03 100644 --- a/mods-available/agent/reposerver.agent +++ b/mods-available/agent/reposerver.agent @@ -78,7 +78,7 @@ function send_general_status { if [ $? != "0" ];then echo -e "An error occured while sending data\n" else - echo -e "Data have been send\n" + echo -e "Data have been sent\n" fi } @@ -102,7 +102,7 @@ function send_packages_status { if [ $? != "0" ];then echo -e "An error occured while sending data\n" else - echo -e "Data have been send\n" + echo -e "Data have been sent\n" fi } @@ -112,7 +112,7 @@ function send_full_status { if [ $? != "0" ];then echo -e "An error occured while sending data\n" else - echo -e "Data have been send\n" + echo -e "Data have been sent\n" fi } diff --git a/mods-available/reposerver.mod b/mods-available/reposerver.mod index 310cb4a..ba7c087 100644 --- a/mods-available/reposerver.mod +++ b/mods-available/reposerver.mod @@ -794,12 +794,12 @@ function getProfileConf done if [ "$GET_PROFILE_PKG_CONF_FROM_REPOSERVER" == "null" ];then - echo -e "[$YELLOW ERROR $RESET] Server send ${YELLOW}null${RESET} data" + echo -e "[$YELLOW ERROR $RESET] Server sent ${YELLOW}null${RESET} data" return 2 fi if [ "$GET_PROFILE_REPOS_FROM_REPOSERVER" == "null" ];then - echo -e "[$YELLOW ERROR $RESET] Server send ${YELLOW}null${RESET} data" + echo -e "[$YELLOW ERROR $RESET] Server sent ${YELLOW}null${RESET} data" return 2 fi @@ -911,7 +911,7 @@ function getProfileRepos # On s'assure que le paramètre 'configuraiton' fait bien partie de la réponse JSON renvoyée par le serveur # Ce paramètre peut être vide toutefois si la configuration du profil côté serveur n'a aucun repo de configuré if ! echo "$CURL" | grep -q "results";then - echo -e "[$YELLOW ERROR $RESET] $PROFILE profile repos sources configuration have not been sended by reposerver." + echo -e "[$YELLOW ERROR $RESET] $PROFILE profile repos sources configuration have not been sent by reposerver." return 2 fi @@ -932,6 +932,7 @@ function getProfileRepos rm /etc/yum.repos.d/*.repo -f fi if [ "$OS_FAMILY" == "Debian" ];then + echo -n> /etc/apt/sources.list rm /etc/apt/sources.list.d/*.list -f fi diff --git a/version b/version index 72d132f..565a0d4 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.2.9 \ No newline at end of file +2.2.10 \ No newline at end of file