jody/yacy_search_server
1
0 Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2026-10-25 05:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #597 from joestr/issue/574-fix-mac-script

Browse Source 
Fix macOS script
This commit is contained in:
Michael Christen authored and GitHub committed 2023-09-28 21:10:49 +02:00
2 parents a035b21f63 09783ae89e
commit 961d3cc8af
2 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

addon/YaCy.app/Contents/MacOS/startYACYMacOS.sh
+1 -1
View File
@@ -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 -s "'Library/Application Support/net.yacy.YaCy'" "`dirname $0`"/startYACY.sh -s 'Library/Application Support/net.yacy.YaCy'
startYACY.sh
+7 -7
View File
@@ -143,7 +143,7 @@ done
if [ ! -z "$parameter" ] && [ "$STARTUP" -eq 1 -o "$GUI" -eq 1 ]; then if [ ! -z "$parameter" ] && [ "$STARTUP" -eq 1 -o "$GUI" -eq 1 ]; then
# The data path is explicitely provided with startup or gui option # The data path is explicitely provided with startup or gui option
YACY_PARENT_DATA_PATH="`echo $parameter | cut -d' ' -f1`" YACY_PARENT_DATA_PATH=$parameter
if [ ! "`echo $YACY_PARENT_DATA_PATH | cut -c1`" = "/" ]; then if [ ! "`echo $YACY_PARENT_DATA_PATH | cut -c1`" = "/" ]; then
# Parent DATA path is relative to the user home # Parent DATA path is relative to the user home
YACY_PARENT_DATA_PATH="$HOME/$YACY_PARENT_DATA_PATH" YACY_PARENT_DATA_PATH="$HOME/$YACY_PARENT_DATA_PATH"
@@ -184,7 +184,7 @@ fi
#turn on MMap for Solr if OS is a 64bit OS #turn on MMap for Solr if OS is a 64bit OS
if [ -n "`uname -m | grep 64`" ]; then JAVA_ARGS="$JAVA_ARGS -Dsolr.directoryFactory=solr.MMapDirectoryFactory"; fi if [ -n "`uname -m | grep 64`" ]; then JAVA_ARGS="$JAVA_ARGS -Dsolr.directoryFactory=solr.MMapDirectoryFactory"; fi
if [ -f $CONFIGFILE ] if [ -f "$CONFIGFILE" ]
then then
# startup memory # startup memory
@@ -192,7 +192,7 @@ then
then then
# When YACY_JAVASTART_XMX is not set or empty: # When YACY_JAVASTART_XMX is not set or empty:
# Read from $CONFIGFILE # Read from $CONFIGFILE
j="`grep javastart_Xmx $CONFIGFILE | sed 's/^[^=]*=//'`"; j="`grep javastart_Xmx "$CONFIGFILE" | sed 's/^[^=]*=//'`";
if [ -n "$j" ]; then JAVA_ARGS="-$j $JAVA_ARGS"; fi; if [ -n "$j" ]; then JAVA_ARGS="-$j $JAVA_ARGS"; fi;
else else
# use the YACY_JAVASTART_XMX variable # use the YACY_JAVASTART_XMX variable
@@ -200,14 +200,14 @@ then
fi fi
# Priority # Priority
j="`grep javastart_priority $CONFIGFILE | sed 's/^[^=]*=//'`"; j="`grep javastart_priority "$CONFIGFILE" | sed 's/^[^=]*=//'`";
if [ -n "$j" ]; then JAVA="nice -n $j $JAVA"; fi; if [ -n "$j" ]; then JAVA="nice -n $j $JAVA"; fi;
PORT="`grep ^port= $CONFIGFILE | sed 's/^[^=]*=//'`"; PORT="`grep ^port= "$CONFIGFILE" | sed 's/^[^=]*=//'`";
if [ -z "$PORT" ]; then PORT="8090"; fi; if [ -z "$PORT" ]; then PORT="8090"; fi;
# for i in `grep javastart $CONFIGFILE`;do # for i in `grep javastart "$CONFIGFILE"`;do
# i="${i#javastart_*=}"; # i="${i#javastart_*=}";
# JAVA_ARGS="-$i $JAVA_ARGS"; # JAVA_ARGS="-$i $JAVA_ARGS";
# done # done
@@ -228,7 +228,7 @@ cmdline="$JAVA $JAVA_ARGS -classpath $CLASSPATH net.yacy.yacy";
if [ $STARTUP -eq 1 ] #startup if [ $STARTUP -eq 1 ] #startup
then then
cmdline="$cmdline -startup $parameter" cmdline="$cmdline -startup \"$parameter\""
elif [ $GUI -eq 1 ];then #gui elif [ $GUI -eq 1 ];then #gui
cmdline="$cmdline -gui $parameter" cmdline="$cmdline -gui $parameter"
fi fi