diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index dcc51faa..19d02be4 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -41,7 +41,7 @@ jobs: run: | cd sing-rule || exit 1 wget -q https://github.com/SagerNet/sing-box/releases/download/v1.8.12/sing-box-1.8.12-linux-amd64.tar.gz -O sing-box.tar.gz && tar zxvf sing-box.tar.gz && mv sing-box-1.8.12-linux-amd64/sing-box ./ - chmod 755 sing-box ACL4SSR/convert_srs.sh && ./ACL4SSR/convert_srs.sh + chmod 755 sing-box ACL4SSR/convert_srs.sh && ./ACL4SSR/convert_srs.sh ../sing-box rm -rf sing-box* LICENSE README.md ACL4SSR/convert_* - name: Git push assets to "sing-rule" branch diff --git a/resouces/convert_srs.sh b/resouces/convert_srs.sh index d61528a7..3c873739 100755 --- a/resouces/convert_srs.sh +++ b/resouces/convert_srs.sh @@ -2,7 +2,12 @@ CURRENT_DIR=$(cd $(dirname $0); pwd) -target_dir=$1 +sing_exe=$1 +if [ -z "$sing_exe" ]; then + sing_exe='./sing-box' +fi + +target_dir=$2 if [ -z "$target_dir" ]; then target_dir=$CURRENT_DIR fi @@ -20,7 +25,7 @@ echo "finding<= ${target_dir}" find . -type f -name "*.json" | while read filename; do srs_file=${filename%.json}.srs echo "source << ${filename}" - ./sing-box rule-set compile $filename -o $srs_file + sing_exe rule-set compile $filename -o $srs_file echo -e "output >> ${srs_file}\n" done