extern LyXServer * lyxserver;
-extern string system_lyxdir;
-extern string user_lyxdir;
-
DebugStream lyxerr;
boost::scoped_ptr<LastFiles> lastfiles;
lyx_gui::use_gui = gui;
if (lyxrc.template_path.empty()) {
- lyxrc.template_path = AddPath(system_lyxdir, "templates");
+ lyxrc.template_path = AddPath(system_lyxdir(), "templates");
}
if (lyxrc.lastfiles.empty()) {
- lyxrc.lastfiles = AddName(user_lyxdir, "lastfiles");
+ lyxrc.lastfiles = AddName(user_lyxdir(), "lastfiles");
}
if (lyxrc.roman_font_name.empty())
void LyX::queryUserLyXDir(bool explicit_userdir)
{
- string const configure_script = AddName(system_lyxdir, "configure");
+ string const configure_script = AddName(system_lyxdir(), "configure");
// Does user directory exist?
- FileInfo fileInfo(user_lyxdir);
+ FileInfo fileInfo(user_lyxdir());
if (fileInfo.isOK() && fileInfo.isDir()) {
first_start = false;
FileInfo script(configure_script);
- FileInfo defaults(AddName(user_lyxdir, "lyxrc.defaults"));
+ FileInfo defaults(AddName(user_lyxdir(), "lyxrc.defaults"));
if (defaults.isOK() && script.isOK()
&& defaults.getModificationTime() < script.getModificationTime()) {
lyxerr << _("LyX: reconfiguring user directory")
<< endl;
- Path p(user_lyxdir);
+ Path p(user_lyxdir());
::system(configure_script.c_str());
lyxerr << "LyX: " << _("Done!") << endl;
}
first_start = !explicit_userdir;
lyxerr << bformat(_("LyX: Creating directory %1$s"
- " and running configure..."), user_lyxdir) << endl;
+ " and running configure..."), user_lyxdir()) << endl;
- if (!createDirectory(user_lyxdir, 0755)) {
+ if (!createDirectory(user_lyxdir(), 0755)) {
// Failed, let's use $HOME instead.
- user_lyxdir = GetEnvPath("HOME");
+ user_lyxdir(GetEnvPath("HOME"));
lyxerr << bformat(_("Failed. Will use %1$s instead."),
- user_lyxdir) << endl;
+ user_lyxdir()) << endl;
return;
}
// Run configure in user lyx directory
- Path p(user_lyxdir);
+ Path p(user_lyxdir());
::system(configure_script.c_str());
lyxerr << "LyX: " << _("Done!") << endl;
}
lyxerr << _("Missing directory for -sysdir switch") << endl;
exit(1);
}
- system_lyxdir = arg;
+ system_lyxdir(arg);
return 1;
}
lyxerr << _("Missing directory for -userdir switch") << endl;
exit(1);
}
- user_lyxdir = arg;
+ user_lyxdir(arg);
return 1;
}