From: Stephan Witt <switt@lyx.org>
Date: Thu, 14 Sep 2017 06:52:38 +0000 (+0200)
Subject: #10762 correct user preferences file lookup
X-Git-Tag: 2.3.0rc1~103
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4599a1b6f106a862bd455a9cafac91512bede0fc;p=features.git

#10762 correct user preferences file lookup

(cherry picked from commit 4939741a737223a7b4bafad5bb00122f658fafea)
---

diff --git a/development/MacOSX/lyxeditor b/development/MacOSX/lyxeditor
index d08cdd2cf8..553acb0953 100755
--- a/development/MacOSX/lyxeditor
+++ b/development/MacOSX/lyxeditor
@@ -39,8 +39,8 @@ test -d "${USER_SUPPORT}" || {
 	exit 1
 }
 
-# we prefere newer lyx releases here... the last should catch all
-for LYXDIR in LyX-2.0* LyX-2* LyX-1.6* LyX-1.5* LyX-1.4* LyX*
+# we prefer newer lyx releases here...
+for LYXDIR in LyX-2.4 LyX-2.3 LyX-2.2 LyX-2.1 LyX-2.0 LyX-1.6 LyX-1.5 LyX-1.4 LyX
 do
 	ABS_USER_LYXDIR="${USER_SUPPORT}/${LYXDIR}"
 	test -d "${ABS_USER_LYXDIR}" || {
@@ -53,9 +53,9 @@ do
 	}
 	# preferences file exists.
 	# See if it contains a \\serverpipe entry
-	# Whether it does or not, break out of the loop because we've
-	# found the preferences file.
 	LYXPIPE=$(parse_serverpipe "${PREFERENCES}")
+	# break if pipe entry and pipe detected
+	# hopefully it's the correct LyX instance...
 	if [ -n "$LYXPIPE" -a -p "$LYXPIPE".in ]; then
 		break
 	fi