anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved symlink creation for Mac OS for first LyX start

Browse Source
This commit is contained in:
Stephan Witt 2015-07-21 01:06:36 +02:00
parent 9f972ba90c
commit bdc9977264
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/LyX.cpp
View File

@ -783,33 +783,35 @@ void cleanDuplicateEnvVars()
static void initTemplatePath() static void initTemplatePath()
{ {
FileName const package_template_path = FileName const package_template_path =
FileName(addPath(package().system_support().absFileName(), "templates")); FileName(addName(package().system_support().absFileName(), "templates"));
if (lyxrc.template_path.empty()) { if (lyxrc.template_path.empty()) {
lyxrc.template_path = package_template_path.absFileName(); lyxrc.template_path = package_template_path.absFileName();
} }
#if defined (USE_MACOSX_PACKAGING) #if defined (USE_MACOSX_PACKAGING)
FileName const user_template_path = FileName const user_template_path =
FileName(addPath(package().user_support().absFileName(), "templates")); FileName(addName(package().user_support().absFileName(), "templates"));
if (package_template_path != FileName(lyxrc.template_path) && if (package_template_path != FileName(lyxrc.template_path) &&
user_template_path != FileName(lyxrc.template_path)) user_template_path != FileName(lyxrc.template_path))
{ {
return; return;
} }
/// addPath cannot be used here.
/// The path with trailing slash doesn't work as symlink name.
FileName const user_template_link = FileName const user_template_link =
FileName(user_template_path.absFileName() + "SystemTemplates"); FileName(addName(user_template_path.absFileName(),"SystemTemplates"));
if (user_template_link.isSymLink()) { if (user_template_link.isSymLink() && !equivalent(user_template_link, package_template_path)) {
user_template_link.removeFile(); user_template_link.removeFile();
} }
if (!user_template_link.exists()) { if (!user_template_link.exists()) {
if (!package_template_path.link(user_template_link)) { if (!package_template_path.link(user_template_link)) {
FileName const user_support = package().user_support();
if (user_support.exists() && user_support.isDirectory()) {
LYXERR(Debug::INIT, "Cannot create symlink " + user_template_link.absFileName()); LYXERR(Debug::INIT, "Cannot create symlink " + user_template_link.absFileName());
lyxrc.template_path = package_template_path.absFileName(); lyxrc.template_path = package_template_path.absFileName();
}
return; return;
} }
LYXERR(Debug::INIT, "Symlink \"" << user_template_link.absFileName() << "\" created.");
} }
lyxrc.template_path = user_template_path.absFileName(); lyxrc.template_path = user_template_path.absFileName();
#endif #endif
@ -883,6 +885,8 @@ bool LyX::init()
if (queryUserLyXDir(package().explicit_user_support())) { if (queryUserLyXDir(package().explicit_user_support())) {
package().reconfigureUserLyXDir(""); package().reconfigureUserLyXDir("");
// Now the user directory is present on first start.
initTemplatePath();
} }
fileUnlock(fd, lock_file.c_str()); fileUnlock(fd, lock_file.c_str());
} }