From c7037c1a81b5cd7f5975300c400e394ce602fa7c Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Mon, 9 Mar 2020 14:56:12 +0800
Subject: [PATCH] Update build scripts

---
 .travis.yml                    |  4 ++--
 scripts/build.macos.release.sh |  4 ++--
 scripts/build.windows.sh       | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 29d2723..c47fecd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,7 +80,7 @@ jobs:
     - name: "Windows x86 Build"
       os: windows
       script:
-      - export shell="$mingw32"
+      - export PATH="/c/tools/msys64/mingw32/bin:$PATH"
       - bash scripts/build.windows.sh
       before_deploy:
         - mv subconverter_win64.zip subconverter_win32.zip
@@ -95,7 +95,7 @@ jobs:
     - name: "Windows x86_64 Build"
       os: windows
       script:
-      - export shell="$mingw64"
+      - export PATH="/c/tools/msys64/mingw64/bin:$PATH"
       - bash scripts/build.windows.sh
       deploy:
         provider: releases
diff --git a/scripts/build.macos.release.sh b/scripts/build.macos.release.sh
index fd1429a..2f76414 100644
--- a/scripts/build.macos.release.sh
+++ b/scripts/build.macos.release.sh
@@ -7,11 +7,11 @@ git clone https://github.com/curl/curl
 cd curl
 #./buildconf > /dev/null
 #./configure --with-ssl=/usr/local/opt/openssl@1.1 --without-mbedtls --disable-ldap --disable-ldaps --disable-rtsp --without-libidn2 > /dev/null
-cmake -DHTTP_ONLY=ON -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 .
+cmake -DHTTP_ONLY=ON -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 . > /dev/null
 make -j8 > /dev/null
 cd ..
 
-cp curl/lib/.libs/libcurl.a .
+cp curl/lib/libcurl.a .
 cp /usr/local/lib/libevent.a .
 cp /usr/local/opt/zlib/lib/libz.a .
 cp /usr/local/opt/openssl@1.1/lib/libssl.a .
diff --git a/scripts/build.windows.sh b/scripts/build.windows.sh
index 45943aa..6fe4041 100644
--- a/scripts/build.windows.sh
+++ b/scripts/build.windows.sh
@@ -3,14 +3,14 @@ set -xe
 
 git clone https://github.com/curl/curl
 cd curl
-$shell cmake -DHTTP_ONLY=ON -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -G "Unix Makefiles" .
-$shell make -j4
+cmake -DHTTP_ONLY=ON -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -G "Unix Makefiles" .
+make -j4
 cd ..
 
-$shell cmake .
-$shell make -j2
+cmake -G "Unix Makefiles" .
+make -j2
 rm subconverter.exe
-$shell g++ -o base/subconverter CMakeFiles/subconverter.dir/src/*.obj curl/lib/libcurl.a -static -lpcre2-8 -levent -lyaml-cpp -lssl -lcrypto -lwsock32 -lws2_32 -lz
+g++ -o base/subconverter CMakeFiles/subconverter.dir/src/*.obj curl/lib/libcurl.a -static -lpcre2-8 -levent -lyaml-cpp -lssl -lcrypto -lwsock32 -lws2_32 -lz
 
 mv base subconverter
 zip -q -r subconverter_win64.zip subconverter/