mirror of
https://github.com/yacy/yacy_search_server.git
synced 2025-07-22 09:14:38 -04:00
Fixed options processing for Mac OS
- getopt is BSD style and does not support long options - fixed typing error inparameter value extracting for all platforms
This commit is contained in:
@ -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'"
|
||||
|
12
startYACY.sh
12
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 YaCy
|
||||
USAGE
|
||||
}
|
||||
@ -48,16 +48,16 @@ USAGE
|
||||
#startup YaCy
|
||||
cd "`dirname $0`"
|
||||
|
||||
if [ $OS = "OpenBSD" ]
|
||||
if [ $OS = "OpenBSD" ] || [ $OS = "Darwin" ]
|
||||
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 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 -- $@`"
|
||||
fi
|
||||
|
||||
if [ $? -ne 0 ];then
|
||||
@ -103,7 +103,7 @@ for option in $options;do
|
||||
-t|--tail-log)
|
||||
TAILLOG=1
|
||||
;;
|
||||
-start|-startup)
|
||||
-s|-startup)
|
||||
STARTUP=1
|
||||
isparameter=1
|
||||
;;
|
||||
@ -113,7 +113,7 @@ for option in $options;do
|
||||
;;
|
||||
esac #case option
|
||||
else #parameter
|
||||
if [ x$option = "--" ];then #option / parameter separator
|
||||
if [ $option = "--" ];then #option / parameter separator
|
||||
isparameter=1;
|
||||
continue
|
||||
else
|
||||
|
Reference in New Issue
Block a user