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
pull/72/head
luccioman 9 years ago
parent 24b8741292
commit 421a6e3a95

@ -5,4 +5,4 @@
# This data directory is set in conforming to OS X File System Programming Guide # 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 # 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'"

@ -40,7 +40,7 @@ Options
-l, --logging save the output of YaCy to yacy.log -l, --logging save the output of YaCy to yacy.log
-d, --debug show the output of YaCy on the console -d, --debug show the output of YaCy on the console
-p, --print-out only print the command, which would be executed to start YaCy -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 -g, --gui start a gui for YaCy
USAGE USAGE
} }
@ -48,16 +48,16 @@ USAGE
#startup YaCy #startup YaCy
cd "`dirname $0`" cd "`dirname $0`"
if [ $OS = "OpenBSD" ] if [ $OS = "OpenBSD" ] || [ $OS = "Darwin" ]
then then
if [ $(echo $@ | grep -o "\-\-" | wc -l) -ne 0 ] if [ $(echo $@ | grep -o "\-\-" | wc -l) -ne 0 ]
then then
echo "WARNING: Unfortunately this script does not support long options in $OS." echo "WARNING: Unfortunately this script does not support long options in $OS."
fi fi
options="`getopt hdlptg: $*`" options="`getopt hdlptsg: $*`"
else 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 fi
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
@ -103,7 +103,7 @@ for option in $options;do
-t|--tail-log) -t|--tail-log)
TAILLOG=1 TAILLOG=1
;; ;;
-start|-startup) -s|-startup)
STARTUP=1 STARTUP=1
isparameter=1 isparameter=1
;; ;;
@ -113,7 +113,7 @@ for option in $options;do
;; ;;
esac #case option esac #case option
else #parameter else #parameter
if [ x$option = "--" ];then #option / parameter separator if [ $option = "--" ];then #option / parameter separator
isparameter=1; isparameter=1;
continue continue
else else

Loading…
Cancel
Save