From 3eefeb740e0f2d1604b96d411568ecdaa72dfd47 Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Sun, 9 Feb 2020 14:15:36 +0800
Subject: [PATCH] Bug fix

Change default configuration file to pref.ini and try to look for pref.yml.
Update Dockerfile.
---
 scripts/Dockerfile | 3 ++-
 src/main.cpp       | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 5fb1b5c..1055991 100644
--- a/scripts/Dockerfile
+++ b/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
diff --git a/src/main.cpp b/src/main.cpp
index da85240..6393646 100644
--- a/src/main.cpp
+++ b/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();