From 75beebd31dbc62939efaee4852d1822477a9693f Mon Sep 17 00:00:00 2001 From: carbotaniuman <41451839+carbotaniuman@users.noreply.github.com> Date: Thu, 11 Feb 2021 18:10:06 -0600 Subject: [PATCH] Carb does not know what `/` are --- CHANGELOG.md | 7 ++++++- src/main/kotlin/mdnet/Main.kt | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9b3599..53f9ae9 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security +## [2.0.0-rc12] - 2021-02-11 +### Fixed +- [2021-02-11] Fixed stupid cross platform bug [@carbotaniuman]. + ## [2.0.0-rc11] - 2021-02-11 ### Fixed - [2021-02-11] Fixed docker bug [@carbotaniuman]. @@ -357,7 +361,8 @@ This release contains many breaking changes! Of note are the changes to the cach ### Fixed - [2020-06-11] Tweaked logging configuration to reduce log file sizes by [@carbotaniuman]. -[Unreleased]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc11...HEAD +[Unreleased]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc12...HEAD +[2.0.0-rc12]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc11...2.0.0-rc12 [2.0.0-rc11]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc10...2.0.0-rc11 [2.0.0-rc10]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc9...2.0.0-rc10 [2.0.0-rc9]: https://gitlab.com/mangadex/mangadex_at_home/-/compare/2.0.0-rc8...2.0.0-rc9 diff --git a/src/main/kotlin/mdnet/Main.kt b/src/main/kotlin/mdnet/Main.kt index d1e3639..775d7e5 100644 --- a/src/main/kotlin/mdnet/Main.kt +++ b/src/main/kotlin/mdnet/Main.kt @@ -34,11 +34,11 @@ fun main(args: Array) { @CommandLine.Command(name = "java -jar ", usageHelpWidth = 120, version = ["Client Version ${BuildInfo.VERSION} (Build ${Constants.CLIENT_BUILD})"]) class Main : Runnable { - @field:CommandLine.Option(names = ["-s", "--settings"], defaultValue = "settings.yaml", paramLabel = "", description = ["the settings file (default: \${DEFAULT-VALUE})"]) + @field:CommandLine.Option(names = ["-s", "--settings"], defaultValue = ".\${sys:file.separator}settings.yaml", paramLabel = "", description = ["the settings file (default: \${DEFAULT-VALUE})"]) lateinit var settingsFile: File - @field:CommandLine.Option(names = ["-d", "--database"], defaultValue = ".\\", paramLabel = "", description = ["the database folder (default: \${DEFAULT-VALUE})"]) + @field:CommandLine.Option(names = ["-d", "--database"], defaultValue = ".\${sys:file.separator}", paramLabel = "", description = ["the database folder (default: \${DEFAULT-VALUE})"]) lateinit var databaseFolder: Path - @field:CommandLine.Option(names = ["-c", "--cache"], defaultValue = ".\\images", paramLabel = "", description = ["the cache folder (default: \${DEFAULT-VALUE})"]) + @field:CommandLine.Option(names = ["-c", "--cache"], defaultValue = ".\${sys:file.separator}images", paramLabel = "", description = ["the cache folder (default: \${DEFAULT-VALUE})"]) lateinit var cacheFolder: Path @field:CommandLine.Option(names = ["-h", "--help"], usageHelp = true, description = ["show this help message and exit"]) var helpRequested: Boolean = false @@ -91,7 +91,7 @@ class Main : Runnable { } if (!Files.isDirectory(cacheFolder)) { - throw IllegalArgumentException("Database folder $cacheFolder must be a directory") + throw IllegalArgumentException("Cache folder $cacheFolder must be a directory") } val client = MangaDexClient(settingsFile, databaseFolder, cacheFolder)