From: Kornel Benko <kornel@lyx.org>
Date: Sat, 18 Apr 2020 20:25:55 +0000 (+0200)
Subject: Amend(4) 689f26d2: Add default path to server pipe (cmake build)
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4060efa55c786dfd1a74d3a434d2c0465e82df49;p=features.git

Amend(4) 689f26d2: Add default path to server pipe (cmake build)

Rename the placeholde $$User to $$UserDir

Make it more readable. Suggestion from Stephan Witt.
---

diff --git a/development/cygwin/lyxrc.dist.in b/development/cygwin/lyxrc.dist.in
index d1ca1fb6f2..5be5e06c40 100644
--- a/development/cygwin/lyxrc.dist.in
+++ b/development/cygwin/lyxrc.dist.in
@@ -18,5 +18,5 @@ Format 22
 \screen_font_sans "Arial"
 \screen_font_typewriter "Courier New"
 \preview_scale_factor 1.0
-\serverpipe "$$User/lyxpipe"
+\serverpipe "$$UserDir/lyxpipe"
 \path_prefix "/usr/local/bin:/usr/bin:/usr/X11R6/bin"
diff --git a/development/unix/lyxrc.dist.in b/development/unix/lyxrc.dist.in
index 6e64df115a..119b13a6f0 100644
--- a/development/unix/lyxrc.dist.in
+++ b/development/unix/lyxrc.dist.in
@@ -13,5 +13,5 @@
 Format 25
 
 \texinputs_prefix ".:@LYX_ABS_INSTALLED_DATADIR@tex"
-\serverpipe "$$User/.lyxpipe"
+\serverpipe "$$UserDir/.lyxpipe"
 
diff --git a/development/win32/lyxrc.dist.in b/development/win32/lyxrc.dist.in
index 9b923f1323..2de600769a 100644
--- a/development/win32/lyxrc.dist.in
+++ b/development/win32/lyxrc.dist.in
@@ -12,5 +12,5 @@
 
 Format 25
 
-\serverpipe "\\.\pipe\$$User\lyxpipe"
+\serverpipe "\\.\pipe\$$UserDir\lyxpipe"
 
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index d5a727327f..69072ae4a0 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -673,7 +673,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 				string userdir = package().user_support().absFileName();
 				if (userdir.back() == '/')
 				  userdir = userdir.substr(0, userdir.size()-1);
-				lyxpipes = subst(os::internal_path(lexrc.getString()), "$$User",
+				lyxpipes = subst(os::internal_path(lexrc.getString()), "$$UserDir",
 					userdir);
 			}
 			break;