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.
This commit is contained in:
Kornel Benko 2020-04-18 22:25:55 +02:00
parent 3aae85edf1
commit 333e023e82
4 changed files with 4 additions and 4 deletions

View File

@ -18,5 +18,5 @@ Format 22
\screen_font_sans "Arial" \screen_font_sans "Arial"
\screen_font_typewriter "Courier New" \screen_font_typewriter "Courier New"
\preview_scale_factor 1.0 \preview_scale_factor 1.0
\serverpipe "$$User/lyxpipe" \serverpipe "$$UserDir/lyxpipe"
\path_prefix "/usr/local/bin:/usr/bin:/usr/X11R6/bin" \path_prefix "/usr/local/bin:/usr/bin:/usr/X11R6/bin"

View File

@ -13,5 +13,5 @@
Format 25 Format 25
\texinputs_prefix ".:@LYX_ABS_INSTALLED_DATADIR@tex" \texinputs_prefix ".:@LYX_ABS_INSTALLED_DATADIR@tex"
\serverpipe "$$User/.lyxpipe" \serverpipe "$$UserDir/.lyxpipe"

View File

@ -12,5 +12,5 @@
Format 25 Format 25
\serverpipe "\\.\pipe\$$User\lyxpipe" \serverpipe "\\.\pipe\$$UserDir\lyxpipe"

View File

@ -673,7 +673,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
string userdir = package().user_support().absFileName(); string userdir = package().user_support().absFileName();
if (userdir.back() == '/') if (userdir.back() == '/')
userdir = userdir.substr(0, userdir.size()-1); userdir = userdir.substr(0, userdir.size()-1);
lyxpipes = subst(os::internal_path(lexrc.getString()), "$$User", lyxpipes = subst(os::internal_path(lexrc.getString()), "$$UserDir",
userdir); userdir);
} }
break; break;