Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix usage Yasat no root #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix usage Yasat no root #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e82531
Fix usage Yasat no root
D3vil0p3r Oct 5, 2024
a0d2291
Fix / typo
D3vil0p3r Oct 5, 2024
7518100
Update common
D3vil0p3r Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions yasat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down