diff options
Diffstat (limited to 'src/main.cc')
-rw-r--r-- | src/main.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main.cc b/src/main.cc index eaa732d..1e80c4b 100644 --- a/src/main.cc +++ b/src/main.cc | |||
@@ -34,6 +34,7 @@ | |||
34 | #include "FbTk/I18n.hh" | 34 | #include "FbTk/I18n.hh" |
35 | #include "FbTk/CommandParser.hh" | 35 | #include "FbTk/CommandParser.hh" |
36 | #include "FbTk/FileUtil.hh" | 36 | #include "FbTk/FileUtil.hh" |
37 | #include "FbTk/StringUtil.hh" | ||
37 | 38 | ||
38 | //use GNU extensions | 39 | //use GNU extensions |
39 | #ifndef _GNU_SOURCE | 40 | #ifndef _GNU_SOURCE |
@@ -114,22 +115,22 @@ static void showInfo(ostream &ostr) { | |||
114 | 115 | ||
115 | ostr <<_FB_CONSOLETEXT(Common, DefaultMenuFile, " menu", "default menu file (right aligned - make sure same width as other default values)") | 116 | ostr <<_FB_CONSOLETEXT(Common, DefaultMenuFile, " menu", "default menu file (right aligned - make sure same width as other default values)") |
116 | << ": " | 117 | << ": " |
117 | << DEFAULTMENU << endl; | 118 | << FbTk::StringUtil::expandFilename(DEFAULTMENU) << endl; |
118 | ostr << _FB_CONSOLETEXT(Common, DefaultStyle, " style", "default style (right aligned - make sure same width as other default values)") | 119 | ostr << _FB_CONSOLETEXT(Common, DefaultStyle, " style", "default style (right aligned - make sure same width as other default values)") |
119 | << ": " | 120 | << ": " |
120 | << DEFAULTSTYLE << endl; | 121 | << FbTk::StringUtil::expandFilename(DEFAULTSTYLE) << endl; |
121 | 122 | ||
122 | ostr << _FB_CONSOLETEXT(Common, DefaultKeyFile, " keys", "default key file (right aligned - make sure same width as other default values)") | 123 | ostr << _FB_CONSOLETEXT(Common, DefaultKeyFile, " keys", "default key file (right aligned - make sure same width as other default values)") |
123 | << ": " | 124 | << ": " |
124 | << DEFAULTKEYSFILE << endl; | 125 | << FbTk::StringUtil::expandFilename(DEFAULTKEYSFILE) << endl; |
125 | ostr << _FB_CONSOLETEXT(Common, DefaultInitFile, " init", "default init file (right aligned - make sure same width as other default values)") | 126 | ostr << _FB_CONSOLETEXT(Common, DefaultInitFile, " init", "default init file (right aligned - make sure same width as other default values)") |
126 | << ": " | 127 | << ": " |
127 | << DEFAULT_INITFILE << endl; | 128 | << FbTk::StringUtil::expandFilename(DEFAULT_INITFILE) << endl; |
128 | 129 | ||
129 | #ifdef NLS | 130 | #ifdef NLS |
130 | ostr << _FB_CONSOLETEXT(Common, DefaultLocalePath, " nls", "location for localization files (right aligned - make sure same width as other default values)") | 131 | ostr << _FB_CONSOLETEXT(Common, DefaultLocalePath, " nls", "location for localization files (right aligned - make sure same width as other default values)") |
131 | << ": " | 132 | << ": " |
132 | << LOCALEPATH << endl; | 133 | << FbTk::StringUtil::expandFilename(LOCALEPATH) << endl; |
133 | #endif | 134 | #endif |
134 | 135 | ||
135 | const char NOT[] = "-"; | 136 | const char NOT[] = "-"; |
@@ -369,7 +370,7 @@ void setupConfigFiles(const std::string& dirname, const std::string& rc) { | |||
369 | // copy default files if needed | 370 | // copy default files if needed |
370 | for (size_t i = 0; i < nr_of_cfiles; ++i) { | 371 | for (size_t i = 0; i < nr_of_cfiles; ++i) { |
371 | if (cfiles[i].create_file) { | 372 | if (cfiles[i].create_file) { |
372 | FbTk::FileUtil::copyFile(cfiles[i].default_name, cfiles[i].filename.c_str()); | 373 | FbTk::FileUtil::copyFile(FbTk::StringUtil::expandFilename(cfiles[i].default_name).c_str(), cfiles[i].filename.c_str()); |
373 | sync_fs = true; | 374 | sync_fs = true; |
374 | } | 375 | } |
375 | } | 376 | } |