From 6e825316c199ade60712749581ccd500c59a553a Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 5 Oct 2024 18:45:14 +0200 Subject: [PATCH 1/3] Fix usage Yasat no root yasat.advice will be written in the HOME folder as occurs for all other files. In this way, the user can use Yasat also with no root privileges. Furthermore, fixed some `/` typo. --- yasat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yasat b/yasat index e3fbc60..015c9c0 100755 --- a/yasat +++ b/yasat @@ -37,9 +37,9 @@ POSSIBLE_APACHE_BIN="/usr/sbin/apache2 /usr/local/sbin/httpd /usr/local/sbin/apa DEBUG=0 # the .yasat directory in the home of the user running yasat -YASAT_HOMEDIR="$HOME/.yasat/" +YASAT_HOMEDIR="$HOME/.yasat" if [ -z "$YASAT_HOMEDIR" ];then - YASAT_HOMEDIR="`echo ~/.yasat/`" + YASAT_HOMEDIR="`echo ~/.yasat`" fi HTML_OUTPUT="" ADVICELANG="EN" @@ -505,7 +505,7 @@ fi if [ -d "$PLUGINS_REP" ] ; then LISTE_ADVICE="`ls $PLUGINS_REP/*.advice`" - cat $LISTE_ADVICE | grep $ADVICELANG > ${YASAT_ROOT}/yasat.advices + cat $LISTE_ADVICE | grep $ADVICELANG > ${YASAT_HOMEDIR}/yasat.advices if [ -z "$ONEPLUGIN" ] ; then Debug "Analyse de $PLUGINS_REP" From a0d22911ea13044ba43f0d036769366fbbf332ab Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 5 Oct 2024 18:46:26 +0200 Subject: [PATCH 2/3] Fix / typo --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 92f64c9..acfc1bc 100644 --- a/common +++ b/common @@ -3442,7 +3442,7 @@ setup_yasat_defaults() { ################################################################################ ################################################################################ setup_yasat_tmpdir() { - TEMPYASATDIR="`echo ~/.yasat/`" + TEMPYASATDIR="`echo ~/.yasat`" mkdir -p $TEMPYASATDIR if [ $? -ne 0 ];then TEMPYASATDIR='/tmp/yasat' From 7518100d11181e779fc51dfd912c7c99526909c7 Mon Sep 17 00:00:00 2001 From: Antonio Date: Mon, 14 Oct 2024 19:37:24 +0200 Subject: [PATCH 3/3] Update common --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index acfc1bc..f35f46b 100644 --- a/common +++ b/common @@ -215,7 +215,7 @@ Display() if [ -z "${ADVICE}" -o "${ADVICE}" = 'NONE' ] ;then ADVICEVALUE='' else - ADVICEVALUE="`grep ${ADVICE}= ${YASAT_ROOT}/yasat.advices | cut -d\= -f2-`" + ADVICEVALUE="`grep ${ADVICE}= ${YASAT_HOME}/yasat.advices | cut -d\= -f2-`" if [ -z "$ADVICEVALUE" ] ;then Display --indent 2 --text "BUG ADVICEVALUE is empty for ${ADVICE}" --result WARNING --color RED --advice YASAT_BUG fi