|
23 | 23 | namespace sfs = std::filesystem; |
24 | 24 |
|
25 | 25 | namespace { |
26 | | -std::string home_dir() { |
| 26 | +sfs::path home_dir() { |
27 | 27 | const char *env = getenv("HOME"); |
28 | 28 | if (env) return env; |
29 | 29 |
|
@@ -55,20 +55,20 @@ sfs::path data_dir() { |
55 | 55 |
|
56 | 56 | namespace agi { |
57 | 57 | void Path::FillPlatformSpecificPaths() { |
58 | | - sfs::path home = home_dir(); |
59 | | - SetToken("?user", home/".aegisub"); |
60 | | - SetToken("?local", home/".aegisub"); |
| 58 | + sfs::path dotdir = home_dir()/".aegisub"; |
| 59 | + SetToken("?user", dotdir.string()); |
| 60 | + SetToken("?local", dotdir.string()); |
61 | 61 |
|
62 | 62 | #ifdef APPIMAGE_BUILD |
63 | 63 | sfs::path data = data_dir(); |
64 | | - if (data == "") data = home/".aegisub"; |
65 | | - SetToken("?data", data); |
| 64 | + if (data == "") data = dotdir.string(); |
| 65 | + SetToken("?data", data.string()); |
66 | 66 | SetToken("?dictionary", Decode("?data/dictionaries")); |
67 | 67 | #else |
68 | 68 | SetToken("?data", P_DATA); |
69 | 69 | SetToken("?dictionary", "/usr/share/hunspell"); |
70 | 70 | #endif |
71 | 71 |
|
72 | | - SetToken("?temp", sfs::temp_directory_path()); |
| 72 | + SetToken("?temp", sfs::temp_directory_path().string()); |
73 | 73 | } |
74 | 74 | } |
0 commit comments