s416496/musique
1
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

Fix config path resolution on Windows

Browse Source
This commit is contained in:
Robert Bendun 2023-01-02 06:41:58 +01:00
parent 37bc4e87b3
commit 6588363fa3
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
musique/config.cc
View File

@ -76,17 +76,10 @@ std::string config::location()
#endif #endif
#ifdef MUSIQUE_WINDOWS #ifdef MUSIQUE_WINDOWS
wchar_t *resultPath = nullptr; auto drive = getenv("HOMEDRIVE");
SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, nullptr, &resultPath); auto path = getenv("HOMEPATH");
auto const len = std::strlen((char*)resultPath); ensure(drive && path, "Windows failed to provide HOMEDRIVE & HOMEPATH variables");
if (!resultPath && len < 3) { return std::string(drive) + std::string(path) + "\\Documents\\musique.conf";
auto drive = getenv("HOMEDRIVE");
auto path = getenv("HOMEPATH");
ensure(drive && path, "Windows failed to provide HOMEDRIVE & HOMEPATH variables");
return std::string(drive) + std::string(path) + "\\Documents\\musique.conf";
}
return std::string((char*)resultPath, len) + "\\musique.conf";
#endif #endif
#ifdef MUSIQUE_DARWIN #ifdef MUSIQUE_DARWIN

2
scripts/release
View File

@ -4,7 +4,7 @@
# Release is defined as a zip archive containing source code, # Release is defined as a zip archive containing source code,
# build binaries for supported platforms and build documentation # build binaries for supported platforms and build documentation
set -e -o pipefail set -xe -o pipefail
Suffix="$(date +"%Y-%m-%d")" Suffix="$(date +"%Y-%m-%d")"
Target="release_$Suffix" Target="release_$Suffix"