Skip to content

Commit b2aa654

Browse files
committed
[improve/bugfix] improve builder.sh codebase and fix same issues
1 parent 7cc7534 commit b2aa654

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

Xray-core

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 3c826392b6c830de88aef209b56782dee0b6fbb5
1+
Subproject commit 01208225ee7e508044cca8eb6776a117bcecd997

builder.sh

+8-7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ if [ -n "$GITHUB_ACTIONS" ]; then
1010
for dir in "nekoray" "v2ray-core" "sing-box-extra" "sing-box" "libneko" "Xray-core"; do
1111
[ -d "$dir" ] && rm -rf "$dir"
1212
done
13+
else
14+
if ! rmdir nekoray v2ray-core sing-box-extra sing-box libneko Xray-core 2> /dev/null; then
15+
echo "clean and ready..."
16+
fi
1317
fi
1418

1519
# Clone or update repositories with a function
@@ -29,11 +33,7 @@ clone_or_update_repo() {
2933

3034
# Array to store repository URLs
3135
repos=("nekoray=https://github.com/MatsuriDayo/nekoray.git"
32-
"v2ray-core=https://github.com/MatsuriDayo/v2ray-core.git"
33-
"sing-box-extra=https://github.com/MatsuriDayo/sing-box-extra.git"
34-
"sing-box=https://github.com/MatsuriDayo/sing-box.git"
35-
"libneko=https://github.com/MatsuriDayo/libneko.git"
36-
"Xray-core=https://github.com/MatsuriDayo/Xray-core.git")
36+
"v2ray-core=https://github.com/MatsuriDayo/v2ray-core.git")
3737

3838
# Clone or update repositories using the function
3939
for repo_info in "${repos[@]}"; do
@@ -70,7 +70,8 @@ done
7070
export PATH="/usr/local/opt/qt@5/bin:$PATH"
7171
export LDFLAGS="-L/usr/local/opt/qt@5/lib"
7272
export CPPFLAGS="-I/usr/local/opt/qt@5/include"
73-
export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig"
73+
export QT_QPA_PLATFORM_PLUGIN_PATH="/usr/local/opt/qt@5/plugins"
74+
# export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig"
7475

7576
# Install macdeployqt for macOS
7677
check_and_install "macdeployqt" "qt@5"
@@ -114,7 +115,7 @@ curl -fLso "$nApp/Contents/MacOS/geoip.db" "https://github.com/SagerNet/sing-geo
114115
curl -fLso "$nApp/Contents/MacOS/geosite.db" "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db"
115116

116117
# Copy fa_IR.qm and zh_CN.qm to nekoray.app/Contents/MacOS
117-
for file in "fa_IR.qm" "zh_CN.qm"; do
118+
for file in "fa_IR.qm" "zh_CN.qm" "ru_RU.qm"; do
118119
cp "$nPath/build/$file" "$nApp/Contents/MacOS"
119120
done
120121

libneko

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit b59836aa8aff069021948d226fe7e84c0a05af62
1+
Subproject commit a26f0dbb1467bd181f76e2560e956633d9637e9d

nekoray

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 359c630c2083cca59b66a7b8d61bd9321b59d3cf
1+
Subproject commit 91b3d18e97f52d3f12f737552926ed9a5fb9be44

sing-box

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit d3aea85331b203c2b5af0ab9293ef9b9c843306b
1+
Subproject commit f683772ed76dc0793dad962d5057a5ac2d0cd086

sing-box-extra

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 03df5df5b343c2d6da6bfd27656a12353cc457dd
1+
Subproject commit 6f39a10817860794badf1be7f5c0df3ff5f9a532

0 commit comments

Comments
 (0)