diff --git a/Xray-core b/Xray-core index 3c82639..0120822 160000 --- a/Xray-core +++ b/Xray-core @@ -1 +1 @@ -Subproject commit 3c826392b6c830de88aef209b56782dee0b6fbb5 +Subproject commit 01208225ee7e508044cca8eb6776a117bcecd997 diff --git a/builder.sh b/builder.sh index 71757a7..406b108 100644 --- a/builder.sh +++ b/builder.sh @@ -10,6 +10,10 @@ if [ -n "$GITHUB_ACTIONS" ]; then for dir in "nekoray" "v2ray-core" "sing-box-extra" "sing-box" "libneko" "Xray-core"; do [ -d "$dir" ] && rm -rf "$dir" done +else + if ! rmdir nekoray v2ray-core sing-box-extra sing-box libneko Xray-core 2> /dev/null; then + echo "clean and ready..." + fi fi # Clone or update repositories with a function @@ -29,11 +33,7 @@ clone_or_update_repo() { # Array to store repository URLs repos=("nekoray=https://github.com/MatsuriDayo/nekoray.git" - "v2ray-core=https://github.com/MatsuriDayo/v2ray-core.git" - "sing-box-extra=https://github.com/MatsuriDayo/sing-box-extra.git" - "sing-box=https://github.com/MatsuriDayo/sing-box.git" - "libneko=https://github.com/MatsuriDayo/libneko.git" - "Xray-core=https://github.com/MatsuriDayo/Xray-core.git") + "v2ray-core=https://github.com/MatsuriDayo/v2ray-core.git") # Clone or update repositories using the function for repo_info in "${repos[@]}"; do @@ -70,7 +70,8 @@ done export PATH="/usr/local/opt/qt@5/bin:$PATH" export LDFLAGS="-L/usr/local/opt/qt@5/lib" export CPPFLAGS="-I/usr/local/opt/qt@5/include" -export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig" +export QT_QPA_PLATFORM_PLUGIN_PATH="/usr/local/opt/qt@5/plugins" +# export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig" # Install macdeployqt for macOS check_and_install "macdeployqt" "qt@5" @@ -114,7 +115,7 @@ curl -fLso "$nApp/Contents/MacOS/geoip.db" "https://github.com/SagerNet/sing-geo curl -fLso "$nApp/Contents/MacOS/geosite.db" "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db" # Copy fa_IR.qm and zh_CN.qm to nekoray.app/Contents/MacOS -for file in "fa_IR.qm" "zh_CN.qm"; do +for file in "fa_IR.qm" "zh_CN.qm" "ru_RU.qm"; do cp "$nPath/build/$file" "$nApp/Contents/MacOS" done diff --git a/libneko b/libneko index b59836a..a26f0db 160000 --- a/libneko +++ b/libneko @@ -1 +1 @@ -Subproject commit b59836aa8aff069021948d226fe7e84c0a05af62 +Subproject commit a26f0dbb1467bd181f76e2560e956633d9637e9d diff --git a/nekoray b/nekoray index 359c630..91b3d18 160000 --- a/nekoray +++ b/nekoray @@ -1 +1 @@ -Subproject commit 359c630c2083cca59b66a7b8d61bd9321b59d3cf +Subproject commit 91b3d18e97f52d3f12f737552926ed9a5fb9be44 diff --git a/sing-box b/sing-box index d3aea85..f683772 160000 --- a/sing-box +++ b/sing-box @@ -1 +1 @@ -Subproject commit d3aea85331b203c2b5af0ab9293ef9b9c843306b +Subproject commit f683772ed76dc0793dad962d5057a5ac2d0cd086 diff --git a/sing-box-extra b/sing-box-extra index 03df5df..6f39a10 160000 --- a/sing-box-extra +++ b/sing-box-extra @@ -1 +1 @@ -Subproject commit 03df5df5b343c2d6da6bfd27656a12353cc457dd +Subproject commit 6f39a10817860794badf1be7f5c0df3ff5f9a532