Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance
Java decentralizedintranet-searchintranet-search-enginep2pp2p-networkprivacyprivacy-protectionsearch-enginesearchenginewebweb-search-enginewebsearchwebseearch-engine
Fixed options processing for Mac OS
luccioman421a6e3a95ee
diff --git a/addon/YaCy.app/Contents/MacOS/startYACYMacOS.sh b/addon/YaCy.app/Contents/MacOS/startYACYMacOS.shindex 456ddea4e..692ec913f 100755--- a/addon/YaCy.app/Contents/MacOS/startYACYMacOS.sh+++ b/addon/YaCy.app/Contents/MacOS/startYACYMacOS.sh@@ -5,4 +5,4 @@# This data directory is set in conforming to OS X File System Programming Guide# see : https://developer.apple.com/library/ios/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/MacOSXDirectories/MacOSXDirectories.html-"`dirname $0`"/startYACY.sh -startup "'Library/Application Support/net.yacy.YaCy'"+"`dirname $0`"/startYACY.sh -s "'Library/Application Support/net.yacy.YaCy'"diff --git a/startYACY.sh b/startYACY.shindex 5e52a9292..f935ae2e3 100755--- a/startYACY.sh+++ b/startYACY.sh@@ -40,7 +40,7 @@ Options-l, --logging save the output of YaCy to yacy.log-d, --debug show the output of YaCy on the console-p, --print-out only print the command, which would be executed to start YaCy- --start, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home+ -s, --startup [data-path] start YaCy using the specified data folder path, relative to the current user home-g, --gui start a gui for YaCyUSAGE}@@ -48,16 +48,16 @@ USAGE#startup YaCycd "`dirname $0`"-if [ $OS = "OpenBSD" ]+if [ $OS = "OpenBSD" ] || [ $OS = "Darwin" ]thenif [ $(echo $@ | grep -o "\-\-" | wc -l) -ne 0 ]thenecho "WARNING: Unfortunately this script does not support long options in $OS."fi- options="`getopt hdlptg: $*`"+ options="`getopt hdlptsg: $*`"else- options="`getopt -n YaCy -o h,d,l,p,t,g -l help,debug,logging,print-out,tail-log,gui,start,startup -- $@`"+ options="`getopt -n YaCy -o h,d,l,p,t,s,g -l help,debug,logging,print-out,tail-log,startup,gui -- $@`"fiif [ $? -ne 0 ];then@@ -103,7 +103,7 @@ for option in $options;do-t|--tail-log)TAILLOG=1;;- -start|-startup)+ -s|-startup)STARTUP=1isparameter=1;;@@ -113,7 +113,7 @@ for option in $options;do;;esac #case optionelse #parameter- if [ x$option = "--" ];then #option / parameter separator+ if [ $option = "--" ];then #option / parameter separatorisparameter=1;continueelse