4 files changed, 105 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 338f7f752305..7e5bd08701b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
-pkgbase = lua-format-git
+pkgbase = lua-format
 	pkgdesc = LuaFormatter - Code formatter for Lua
-	pkgver = r50.21e0205
+	pkgver = 1.3.0
 	pkgrel = 1
 	url = https://github.com/Koihik/LuaFormatter
 	arch = x86_64
 	license = Apache2
 	depends = antlr4-runtime
+	depends = yaml-cpp
 	provides = lua-format
 	provides = LuaFormatter
 	conflicts = lua-format
 	conflicts = LuaFormatter
-	source = git+https://github.com/Koihik/LuaFormatter
-	source = antlr4.patch
-	sha512sums = SKIP
-	sha512sums = e33afdda51c9ab3aa23a7ccad536762f2807972e9bde52ea67793dbc9bb3c3884daf2fed830d44f0b34c6f7bef2e327af8634293fba74ceb091bf71bbd2fe662
+	source = https://github.com/Koihik/LuaFormatter/archive/1.3.0.tar.gz
+	source = https://github.com/Taywee/args/archive/6.2.2.tar.gz
+	source = lib.patch
+	sha512sums = 1ea6183759c71147128caf36c22bcc5108cf0a4604d5c1ff426b91e6debceeb86f5ead87fef4e4de5e6339f2e35a8d2f7d48bd6722ccfd4e356151749b10fa2c
+	sha512sums = 29b0f53316fe35f65ab92c807180c1e6cc6084dfed9f635aa2e3e848137ee8e5d24ec6831cf19189c6432335f73d1466564e0bc9bc259c98f3f0de264637f971
+	sha512sums = 6c12fd6eae7ea8243216378a392e4bc1a3c2d7a6d16cf89c864c8f6656550e73754542e3068000abfd8ae6cd64af21fe4c2aa353e811fd5d2f94343452c6321b
 
-pkgname = lua-format-git
+pkgname = lua-format
 
diff --git a/PKGBUILD b/PKGBUILD
index fe68ca2978eb..d29e948d27f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,41 @@
 # Maintainer: bilabila <bilabila@qq.com>
-_srcname=LuaFormatter
-_pkgname=lua-format
-_patch=antlr4.patch
-pkgname=$_pkgname-git
-pkgver=r50.21e0205
+_src=LuaFormatter
+_pkg=lua-format
+_pkgver=1.3.0
+_lib=args
+_libver=6.2.2
+_patch=lib.patch
+pkgname=$_pkg
+pkgver=$_pkgver
 pkgrel=1
 pkgdesc='LuaFormatter - Code formatter for Lua'
 arch=(x86_64)
 url=https://github.com/Koihik/LuaFormatter
-provides=($_pkgname $_srcname)
-conflicts=($_pkgname $_srcname)
+provides=($_pkg $_src)
+conflicts=($_pkg $_src)
 license=(Apache2)
-depends=(antlr4-runtime)
-source=(git+https://github.com/Koihik/LuaFormatter
+depends=(antlr4-runtime yaml-cpp)
+
+source=(https://github.com/Koihik/$_src/archive/$_pkgver.tar.gz
+  https://github.com/Taywee/$_lib/archive/$_libver.tar.gz
   $_patch)
-sha512sums=(SKIP
-  e33afdda51c9ab3aa23a7ccad536762f2807972e9bde52ea67793dbc9bb3c3884daf2fed830d44f0b34c6f7bef2e327af8634293fba74ceb091bf71bbd2fe662)
-pkgver() {
-  cd $_srcname
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+sha512sums=(1ea6183759c71147128caf36c22bcc5108cf0a4604d5c1ff426b91e6debceeb86f5ead87fef4e4de5e6339f2e35a8d2f7d48bd6722ccfd4e356151749b10fa2c
+  29b0f53316fe35f65ab92c807180c1e6cc6084dfed9f635aa2e3e848137ee8e5d24ec6831cf19189c6432335f73d1466564e0bc9bc259c98f3f0de264637f971
+  6c12fd6eae7ea8243216378a392e4bc1a3c2d7a6d16cf89c864c8f6656550e73754542e3068000abfd8ae6cd64af21fe4c2aa353e811fd5d2f94343452c6321b
+)
+_src=$_src-$pkgver
 prepare() {
-  cd $_srcname
+  cd $_src
+  rm -rf third_party/$_lib
+  ln -sr ../$_lib-$_libver third_party/$_lib
   patch -Np1 -i ../$_patch
 }
 build() {
-  cd $_srcname
+  cd $_src
   cmake -D BUILD_TESTS=OFF COVERAGE=OFF .
   make
 }
 package() {
-  install -Dm644 $_srcname/LICENSE "$pkgdir"/usr/share/licenses/$_pkgname/LICENSE
-  install -Dm755 $_srcname/$_pkgname "$pkgdir"/usr/bin/$_pkgname
+  install -Dm644 $_src/LICENSE "$pkgdir"/usr/share/licenses/$_pkg/LICENSE
+  install -Dm755 $_src/$_pkg "$pkgdir"/usr/bin/$_pkg
 }
diff --git a/antlr4.patch b/antlr4.patch
deleted file mode 100644
index 7a2cbe72b81f..000000000000
--- a/antlr4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 595fdf6..6ee877c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
- include_directories(
-   ${PROJECT_SOURCE_DIR}/generated/
-   ${PROJECT_SOURCE_DIR}/third_party/
--  ${PROJECT_SOURCE_DIR}/third_party/antlr4-cpp-runtime/
-+  /usr/include/antlr4-runtime
-   ${PROJECT_SOURCE_DIR}/src/
-   )
- 
-@@ -49,7 +49,7 @@ file(GLOB antlr4-cpp-src
-   ${PROJECT_SOURCE_DIR}/third_party/antlr4-cpp-runtime/tree/xpath/*.cpp
- )
- 
--add_library (antlr4-cpp-runtime ${antlr4-cpp-src})
-+#add_library (antlr4-cpp-runtime ${antlr4-cpp-src})
- 
- add_executable(lua-format ${src_dir} src/main.cpp)
- 
-@@ -59,7 +59,7 @@ endif()
- 
- set_target_properties(lua-format PROPERTIES LINKER_LANGUAGE CXX)
- 
--target_link_libraries(lua-format antlr4-cpp-runtime)
-+target_link_libraries(lua-format antlr4-runtime)
- 
- install(TARGETS lua-format
-   RUNTIME DESTINATION bin
-@@ -86,7 +86,7 @@ if(BUILD_TESTS)
-       )
-   endif()
- 
--  target_link_libraries(lua-format-test antlr4-cpp-runtime)
-+  target_link_libraries(lua-format-test antlr4-runtime)
- 
-   add_test(all_tests lua-format-test)
- endif()
-\ No newline at end of file
diff --git a/lib.patch b/lib.patch
new file mode 100644
index 000000000000..638bc3d5d147
--- /dev/null
+++ b/lib.patch
@@ -0,0 +1,70 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 25c7bc7..b4dac53 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,8 +44,7 @@ endif()
+ include_directories(
+   ${PROJECT_SOURCE_DIR}/generated/
+   ${PROJECT_SOURCE_DIR}/third_party/
+-  ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include
+-  ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src
++  /usr/include/antlr4-runtime
+   ${PROJECT_SOURCE_DIR}/src/
+   )
+ 
+@@ -59,17 +58,6 @@ set(src_dir
+   ${PROJECT_SOURCE_DIR}/generated/LuaBaseVisitor.cpp
+ )
+ 
+-file(GLOB_RECURSE antlr4-cpp-src 
+-   ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src/*.cpp
+-)
+-
+-file(GLOB_RECURSE yaml-cpp-src 
+-   ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp
+-)
+-
+-add_library (antlr4-cpp-runtime ${antlr4-cpp-src})
+-add_library (yaml-cpp ${yaml-cpp-src})
+-
+ add_executable(lua-format ${src_dir} src/main.cpp)
+ 
+ if(WIN32)
+@@ -79,7 +67,7 @@ endif()
+ 
+ set_target_properties(lua-format PROPERTIES LINKER_LANGUAGE CXX)
+ 
+-target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime)
++target_link_libraries(lua-format yaml-cpp antlr4-runtime)
+ 
+ install(TARGETS lua-format
+   RUNTIME DESTINATION bin
+diff --git a/src/main.cpp b/src/main.cpp
+index e7b9f36..f0a7f45 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -49,6 +49,24 @@ int main(int argc, const char* argv[]) {
+             if (candidate.filename() == ".lua-format") configFileName = candidate.string();
+         }
+     }
++    // try xdg config
++    if (configFileName.empty()) {
++        char* substitute = getenv("XDG_CONFIG_HOME");
++        if (substitute == NULL) {
++            substitute = getenv("HOME");
++            if (substitute != NULL) {
++                configFileName = string(substitute) + "/.config";
++            }
++        } else {
++            configFileName = string(substitute);
++        }
++        if (!configFileName.empty()) {
++            configFileName = configFileName + "/lua-format/config";
++            if (!fs::exists(configFileName)) {
++                configFileName = "";
++            }
++        }
++    }
+ 
+     if (configFileName.empty()) {
+         if (verbose) cerr << "using default configuration" << endl;