Merge branch 'master' of https://github.com/juewuy/ShellCrash into master

# Conflicts:
#	.github/workflows/update_singbox_core.yaml
#	bin/version

.github/workflows/bin_update.yml

@@ -105,6 +105,8 @@ jobs:
         curl -kfSL -o geodata/china_ip_list.txt https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt
         curl -kfSL -o geodata/china_ipv6_list.txt https://raw.githubusercontent.com/ChanthMiao/China-IPv6-List/release/cn6.txt
         curl -kfSL -o geodata/geosite.dat https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/geosite.dat
+        curl -kfSL -o geodata/geoip_cn.db https://github.com/lyc8503/sing-box-rules/releases/latest/download/geoip-cn.db
+        curl -kfSL -o geodata/geosite_cn.db https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite-cn.db
         curl -kfSL -o fix/ca-certificates.crt https://raw.githubusercontent.com/P3TERX/ca-certificates.crt/download/ca-certificates.crt
         sed -i '/GeoIP_v*/'d version
         echo GeoIP_v=`date '+%Y%m%d'` >> version

.github/workflows/update_meta_core.yaml

@@ -47,10 +47,10 @@ jobs:
         rm -fr upx*
     - name: Update
       run: |
-        rm -fr ./bin/clash.meta/*
-        cp ./tmp/* ./bin/clash.meta/
+        rm -fr ./bin/meta/*
+        cp ./tmp/* ./bin/meta/
         rm -fr ./tmp
-        sed -i "s/meta_v=.*/meta_v=$(./bin/clash.meta/clash-linux-amd64 -v 2>/dev/null | head -n 1 | sed 's/ linux.*//;s/.* //')/" bin/version
+        sed -i "s/meta_v=.*/meta_v=$(./bin/meta/clash-linux-amd64 -v 2>/dev/null | head -n 1 | sed 's/ linux.*//;s/.* //')/" bin/version
     - name: Commit and push
       run: |
         git config --global user.email "juewuy@gmail.com" && git config --global user.name "Bot"

.github/workflows/update_singbox_core.yaml

@@ -1,8 +1,13 @@
 name: Update Sing-Box Core 
 on: 
   workflow_dispatch:
-
+    inputs:
+      version:
+        description: 'version of singbox, such as 1.7.8'
+        required: true
+        type: string
 env:
+  download_version: ${{ github.event.inputs.version }}
   download_project: SagerNet/sing-box
 jobs:
   Update:
@@ -18,7 +23,7 @@ jobs:
         tar xf upx-3.93-amd64_linux.tar.xz
     - name: Download Core
       run: |
-        download_version=$(curl -s -L -o /dev/null -w '%{url_effective}' https://github.com/${download_project}/releases/latest | grep -oE "[^/]+$" | awk -F 'v' '{print $2}')
+        #download_version=$(curl -s -L -o /dev/null -w '%{url_effective}' https://github.com/${download_project}/releases/latest | grep -oE "[^/]+$" | awk -F 'v' '{print $2}')
         echo "download_version=${download_version}" >> ${GITHUB_ENV}
         archs=(386 amd64 armv7 arm64)
         new_name=(386 amd64 armv7 armv8)
@@ -44,7 +49,6 @@ jobs:
       with:
         tag_name: singbox_core
         name: singbox_core
-        body: "The alpha version of singbox core \n这是singbox的官方版本内核文件\nhttps://github.com/SagerNet/sing-box/releases \nZip by upx\n使用了upx进行压缩\nOnly support for ShellCrash\n仅限于ShellCrash项目使用"
         draft: false
         prerelease: true
         files: |