Also check yacy.conf file existence in shell scripts where relevant

This commit is contained in:
luccioman 2018-11-27 11:36:40 +01:00
parent 17ad1f7e65
commit 106bfd0e5f
8 changed files with 15 additions and 0 deletions

View File

@ -15,6 +15,7 @@
cd "`dirname $0`"
. ./checkDataFolder.sh
. ./checkConfFile.sh
port=$(grep ^port= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)
admin=$(grep ^adminAccountUserName= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)

View File

@ -17,6 +17,7 @@
cd "`dirname $0`"
. ./checkDataFolder.sh
. ./checkConfFile.sh
port=$(grep ^port= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)
admin=$(grep ^adminAccountUserName= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)

8
bin/checkConfFile.sh Normal file
View File

@ -0,0 +1,8 @@
#!/usr/bin/env sh
# Check that a yacy configuration file exists under the DATA folder set by the variable YACY_DATA_PATH
# Exits with an error message and status 2 when the file is not found or is not a regular file
if [ ! -f "$YACY_DATA_PATH/SETTINGS/yacy.conf" ]; then
echo "No YaCy configuration file found at $YACY_DATA_PATH/SETTINGS/yacy.conf"
exit 2
fi

View File

@ -1,6 +1,7 @@
#!/usr/bin/env sh
cd "`dirname $0`"
. ./checkDataFolder.sh
. ./checkConfFile.sh
port=$(grep ^port= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)

View File

@ -1,6 +1,7 @@
#!/usr/bin/env sh
cd "`dirname $0`"
. ./checkDataFolder.sh
. ./checkConfFile.sh
port=$(grep ^port= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)
while [ 1 = 1 ]

View File

@ -16,6 +16,7 @@
cd "`dirname $0`"
. ./checkDataFolder.sh
. ./checkConfFile.sh
port=$(grep ^port= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)
admin=$(grep ^adminAccountUserName= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)

View File

@ -1,6 +1,7 @@
#!/usr/bin/env sh
cd "`dirname $0`"
. ./checkDataFolder.sh
. ./checkConfFile.sh
port=$(grep ^port= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)
./search1.sh -y localhost:$port "$1"

View File

@ -1,6 +1,7 @@
#!/usr/bin/env sh
cd "`dirname $0`"
. ./checkDataFolder.sh
. ./checkConfFile.sh
port=$(grep ^port= "$YACY_DATA_PATH/SETTINGS/yacy.conf" |cut -d= -f2)
./searchall1.sh -s localhost:$port $1