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

bin/apicall.sh

@@ -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)

bin/apicat.sh

@@ -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)

bin/checkConfFile.sh

@@ -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

bin/down.sh

@@ -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)
 

bin/graphicstest.sh

@@ -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 ]

bin/protectedPostApiCall.sh

@@ -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)

bin/search.sh

@@ -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"

bin/searchall.sh

@@ -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