Changes to improve compatibility with OpenBSD. (see

http://forum.yacy-websuche.de/viewtopic.php?f=8&t=5503)

bin/addrss.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/Load_RSS_p.html?indexAllItemContent=&repeat=off&url=$1" > /dev/null

bin/apicall.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 port=$(grep ^port= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)
 admin=$(grep ^adminAccountUserName= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)

bin/apicat.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 port=$(grep ^port= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)
 pw=$(grep ^adminAccountBase64MD5= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)

bin/checkalive.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 
 # for a production environment with high-availability requirement,

bin/checkindex.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`/.."
 for i in DATA/INDEX/* ; do
   if [ -d "$i" ]; then

bin/clearall.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/IndexControlURLs_p.html?deletecomplete=&deleteIndex=on&deleteSolr=on&deleteCrawlQueues=on&deleteRobots=on&deleteSearchFl=on&deleteCache=on" > /dev/null

bin/clearapi.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/Tables_p.html?table=api&deletetable=all" > /dev/null

bin/clearcache.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/IndexControlURLs_p.html?deleteIndex=off&deleteSolr=off&deleteCache=on&deleteCrawlQueues=off&deleteRobots=on&deleteSearchFl=on&deletecomplete=" > /dev/null

bin/clearindex.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/IndexControlURLs_p.html?deletecomplete=&deleteIndex=on&deleteSolr=on&deleteCrawlQueues=on&deleteRobots=on&deleteSearchFl=on&deleteCache=off" > /dev/null

bin/deleteurl.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/IndexControlURLs_p.html?urlhashdeleteall=&urlstring=$1" > /dev/null

bin/deploy.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 cd ..
 ./stopYACY.sh

bin/down.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 port=$(grep ^port= ../DATA/SETTINGS/yacy.conf |cut -d= -f2)
 if which curl &>/dev/null; then

bin/dumpcheck.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 java -ea -cp ../classes:../lib/yacycore.jar net.yacy.kelondro.logging.ThreadDump -f $1

bin/importmediawiki.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh /IndexImportMediawiki_p.html?file=$1 > /dev/null

bin/importurllist.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/Crawler_p.html?bookmarkFolder=/crawlStart&crawlingDomMaxPages=10000&intention=&range=domain&indexMedia=on&recrawl=nodoubles&storeHTCache=on&sitemapURL=&repeat_time=7&crawlingQ=on&crawlingIfOlderUnit=day&cachePolicy=ifexist&indexText=on&crawlingMode=file&crawlingURL=http://&bookmarkTitle=&mustnotmatch=&crawlingstart=import&mustmatch=.*&crawlingIfOlderNumber=7&repeat_unit=seldays&crawlingDepth=0&crawlingFile=$1" > /dev/null

bin/indexdump.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/IndexControlURLs_p.xml?indexdump=" | awk '/<dumpfile>/{ gsub("<dumpfile>","" );gsub("<\/dumpfile>","" ); print $0 }' | awk '{print $1}';

bin/indexrestore.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/IndexControlURLs_p.xml?indexrestore=&dumpfile=$1" > /dev/null

bin/myip.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/yacy/seedlist.xml?my=" | awk '/<IP>/{ gsub("<IP>","" );gsub("<\/IP>","" ); print $0 }' | awk '{print $1}';

bin/passwd.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/ConfigAccounts_p.html?setAdmin=&adminuser=admin&adminpw1=$1&adminpw2=$1&access=" > /dev/null
 echo "Password for User Name 'admin' set to '$1'"

bin/search.sh

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

bin/search1.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 if which curl &>/dev/null; then
   while getopts "ys" opt; do

bin/searchall.sh

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

bin/up.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 cd "`dirname $0`"
 ./apicall.sh "/Network.xml?page=1&ip=" | awk '/<address>/{ gsub("<address>","" );gsub("<\/address>","" ); print $0 }' | awk '{print $1}';
 

startYACY.sh

@@ -45,8 +45,20 @@ USAGE
 #startup YaCy
 cd "`dirname $0`"
 
-options="`getopt -n YaCy -o h,d,l,p,t,g -l help,debug,logging,print-out,tail-log,gui -- $@`"
+if [ $OS = "OpenBSD" ]
+then
+		if [ $(echo $@ | grep -o "\-\-" | wc -l) -ne 0  ]
+		then
+			echo "WARNING: Unfortunately this script does not support long options in $OS."
+		fi
+		
+        options="`getopt -n YaCy -o h,d,l,p,t,g -- $@`"
+else
+        options="`getopt -n YaCy -o h,d,l,p,t,g -l help,debug,logging,print-out,tail-log,gui -- $@`"
+fi
+
 if [ $? -ne 0 ];then
+
 	exit 1;
 fi
 
@@ -87,7 +99,7 @@ for option in $options;do
 			-t|--tail-log)
 				TAILLOG=1
 				;;
-			-gui)
+			-g|--gui)
 				GUI=1
 				isparameter=1
 				;;