mirror of
https://github.com/asdlokj1qpi233/subconverter.git
synced 2026-11-05 03:02:06 +00:00
Bug fix
Change default configuration file to pref.ini and try to look for pref.yml. Update Dockerfile.
This commit is contained in:
2 files changed
+5
-2
No files matched your search
+2
-1
@@ -16,4 +16,5 @@ RUN apk add git g++ build-base linux-headers cmake && \
|
|||||||
apk del git gcc g++ build-base linux-headers cmake libressl-dev curl-dev rapidjson-dev libevent-dev pcre2-dev yaml-cpp-dev
|
apk del git gcc g++ build-base linux-headers cmake libressl-dev curl-dev rapidjson-dev libevent-dev pcre2-dev yaml-cpp-dev
|
||||||
|
|
||||||
# set entry
|
# set entry
|
||||||
CMD /base/subconverter
|
WORKDIR /base
|
||||||
|
CMD ./subconverter
|
||||||
+3
-1
@@ -20,7 +20,7 @@
|
|||||||
#include "logger.h"
|
#include "logger.h"
|
||||||
|
|
||||||
//common settings
|
//common settings
|
||||||
std::string pref_path = "pref.yml";
|
std::string pref_path = "pref.ini";
|
||||||
bool generator_mode = false;
|
bool generator_mode = false;
|
||||||
string_array def_exclude_remarks, def_include_remarks, rulesets, stream_rules, time_rules;
|
string_array def_exclude_remarks, def_include_remarks, rulesets, stream_rules, time_rules;
|
||||||
std::vector<ruleset_content> ruleset_content_array;
|
std::vector<ruleset_content> ruleset_content_array;
|
||||||
@@ -1213,6 +1213,8 @@ int main(int argc, char *argv[])
|
|||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
|
||||||
SetConsoleTitle("subconverter " VERSION);
|
SetConsoleTitle("subconverter " VERSION);
|
||||||
|
if(fileExist("pref.yml"))
|
||||||
|
pref_path = "pref.yml";
|
||||||
chkArg(argc, argv);
|
chkArg(argc, argv);
|
||||||
setcd(pref_path);
|
setcd(pref_path);
|
||||||
readConf();
|
readConf();
|
||||||
|
|||||||
Reference in new issue
Block a user