Compare commits

7 Commits

Author SHA1 Message Date
Xu Tianliang
4236a079a9 chore:引用v2ray-release脚本进行打包 2022-02-23 19:46:15 +08:00
Xu Tianliang
002bd9b5f2 chore:更新地址将在发布打包时指定 2022-02-23 19:39:23 +08:00
Xu Tianliang
bfcebe2c48 chore:新建Github Actions自动打包发布 2022-02-23 17:43:00 +08:00
Xu Tianliang
78b9a06c07 feat:适配Magisk 24.0+,添加更新链接 2022-02-21 23:18:47 +08:00
Xu Tianliang
b382a169aa style:更改版本号 2022-01-19 01:08:21 +08:00
Xu Tianliang
335d6df3ab fix:管理应用无法正确安装修复
某些ROM中即使将apk文件复制到/system/app目录下,pm命令也无法识别出应用被安装.
故判断应用安装并不会返回预想的'package:/system/...',而是毫无输出从而返回错误.
故增加判断条件以正确安装管理应用
2022-01-19 01:03:28 +08:00
Xu Tianliang
e21a127b19 feat:卸载插件时删除管理apk 2022-01-18 14:47:35 +08:00
4 changed files with 47 additions and 11 deletions

26
.github/workflows/main.yml vendored Normal file
View File

@@ -0,0 +1,26 @@
# 根据上传的tag打包发布至Github
name: Auto Release
on:
push:
tags:
- '*'
workflow_dispatch:
jobs:
publish-module:
runs-on: ubuntu-latest
steps:
- name: 1.检出代码
uses: actions/checkout@v2
- name: 2.下载打包脚本并执行
run: curl https://yatsuki.github.io/v2ray-release/release.sh | sh
- name: 3.发布
uses: ncipollo/release-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: "自动发布"
artifacts: "v2ray-magisk-android32.zip,v2ray-magisk-android64.zip"

View File

@@ -7,7 +7,6 @@ SKIPUNZIP=1
# prepare v2ray execute environment # prepare v2ray execute environment
ui_print "- Prepare V2Ray execute environment." ui_print "- Prepare V2Ray execute environment."
mkdir -p /data/v2ray mkdir -p /data/v2ray
mkdir -p /data/v2ray/dnscrypt-proxy
mkdir -p /data/v2ray/run mkdir -p /data/v2ray/run
mkdir -p $MODPATH/scripts mkdir -p $MODPATH/scripts
mkdir -p $MODPATH/system/bin mkdir -p $MODPATH/system/bin
@@ -39,16 +38,17 @@ unzip -j -o "${ZIPFILE}" "v2ray/etc/config.json.template" -d /data/v2ray >&2
[ -f /data/v2ray/config.json ] || \ [ -f /data/v2ray/config.json ] || \
cp /data/v2ray/config.json.template /data/v2ray/config.json cp /data/v2ray/config.json.template /data/v2ray/config.json
ln -s /data/v2ray/resolv.conf $MODPATH/system/etc/resolv.conf ln -s /data/v2ray/resolv.conf $MODPATH/system/etc/resolv.conf
# generate module.prop # generate module.prop
ui_print "- Generate module.prop" # ui_print "- Generate module.prop"
rm -rf $MODPATH/module.prop # rm -rf $MODPATH/module.prop
touch $MODPATH/module.prop # touch $MODPATH/module.prop
echo "id=v2ray" > $MODPATH/module.prop # echo "id=v2ray" > $MODPATH/module.prop
echo "name=V2ray for Android" >> $MODPATH/module.prop # echo "name=V2ray for Android" >> $MODPATH/module.prop
echo "version=4.44.0" >> $MODPATH/module.prop # echo "version=2.0.1" >> $MODPATH/module.prop
echo "versionCode=20210801" >> $MODPATH/module.prop # echo "versionCode=20220119" >> $MODPATH/module.prop
echo "author=ohnoku" >> $MODPATH/module.prop # echo "author=ohnoku" >> $MODPATH/module.prop
echo "description=V2ray core with service scripts for Android" >> $MODPATH/module.prop # echo "description=V2ray core with service scripts for Android" >> $MODPATH/module.prop
inet_uid="3003" inet_uid="3003"
net_raw_uid="3004" net_raw_uid="3004"

View File

@@ -4,8 +4,16 @@
# #
########################################################################################## ##########################################################################################
uninstall_manager_apk() {
pm uninstall co.lintian.v2manager
}
remove_v2ray_data_dir() { remove_v2ray_data_dir() {
rm -rf /data/v2ray rm -rf /data/v2ray
} }
# remove v2ray data
remove_v2ray_data_dir remove_v2ray_data_dir
# uninstall manager apk
uninstall_manager_apk

View File

@@ -12,7 +12,9 @@ start_proxy () {
# /system app can not run # /system app can not run
# check the app was installed to /data/ at ervery boot # check the app was installed to /data/ at ervery boot
AppIn=`pm list packages -f | grep lintian` AppIn=`pm list packages -f | grep lintian`
if [[ "$AppIn" = package:/system* ]]; then if [ $? == 1 ]; then
pm install /data/adb/modules/v2ray/system/app/Stk/v2manager.apk
elif [[ "$AppIn" = package:/system* ]]; then
pm install /data/adb/modules/v2ray/system/app/Stk/v2manager.apk pm install /data/adb/modules/v2ray/system/app/Stk/v2manager.apk
fi fi