Browse Source

Bug fix

Change default configuration file to pref.ini and try to look for pref.yml.
Update Dockerfile.
Tindy X 5 years ago
parent
commit
3eefeb740e
2 changed files with 5 additions and 2 deletions
  1. 2 1
      scripts/Dockerfile
  2. 3 1
      src/main.cpp

+ 2 - 1
scripts/Dockerfile

@@ -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
 
 # set entry
-CMD /base/subconverter
+WORKDIR /base
+CMD ./subconverter

+ 3 - 1
src/main.cpp

@@ -20,7 +20,7 @@
 #include "logger.h"
 
 //common settings
-std::string pref_path = "pref.yml";
+std::string pref_path = "pref.ini";
 bool generator_mode = false;
 string_array def_exclude_remarks, def_include_remarks, rulesets, stream_rules, time_rules;
 std::vector<ruleset_content> ruleset_content_array;
@@ -1213,6 +1213,8 @@ int main(int argc, char *argv[])
 #endif // _WIN32
 
     SetConsoleTitle("subconverter " VERSION);
+    if(fileExist("pref.yml"))
+        pref_path = "pref.yml";
     chkArg(argc, argv);
     setcd(pref_path);
     readConf();