Merge branch 'main' of https://github.com/Oreomeow/VIP into main

This commit is contained in:
Leon 2021-08-11 11:20:33 +08:00
commit d567eb13a9
2 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Build 20210810-002
# Build 20210810-003
name_js=(
jd_fruit
@ -157,8 +157,8 @@ TempBlock_JD_COOKIE
for ((i = 0; i < ${#env_name[*]}; i++)); do
case $1 in
*${name_js[i]}.js | *${name_js[i]}.ts)
if [[ -f ${name_config[i]}.log ]]; then
. $dir_log/.ShareCode/${name_config[i]}.log
if [[ -f $dir_log/.ShareCode/${name_config[i]}.log ]]; then
. $dir_log/.ShareCode/${name_config[i]}.log
result=$(combine_sub ${var_name[i]})
if [[ $result ]]; then
export ${env_name[i]}=$result

View File

@ -102,7 +102,7 @@ warn "小白基本回车即可,更多学习内容尽在 https://github.com/ele
inp "是否为 arm 架构系统:\n1) x86_64[默认]\n2arm64\n3arm32"
opt
read architecture
architecture=${image:-'1'}
architecture=${architecture:-'1'}
if [ "$architecture" = "2" ]; then
TAG="arm64"
elif [ "$architecture" = "3" ]; then