修改脚本错误 && 传入参数cookie有；分号 应使用‘’

README.md

@@ -2,7 +2,7 @@
 
 #### 快速部署
 1. `wget --no-check-certificate https://raw.githubusercontent.com/mixool/jd_sku/main/jdformat.sh && chmod +x jdformat.sh`
-2. `bash jdformat.sh jd_sku_var@JD_COOKIE@pt_key=aaa;pt_pin=aaaa; jd_sku_var@ENABLE_AUTO_HELP@true jd_sku_var@CUSTOM_SHELL_FILE=https://raw.githubusercontent.com/mixool/jd_sku/main/jd_i-chenzhe.sh`
+2. `bash jdformat.sh 'jd_sku_var@JD_COOKIE@pt_key=aaa;pt_pin=aaaa; jd_sku_var@ENABLE_AUTO_HELP@true jd_sku_var@CUSTOM_SHELL_FILE=https://raw.githubusercontent.com/mixool/jd_sku/main/jd_i-chenzhe.sh'`
 
 #### 容器执行
 1. cd /jd_sku/jd_scripts && docker-compose up -d

jdformat.sh

@@ -8,44 +8,44 @@ echo $@ | grep -qE "fromfile@[^ ]+" && all_parameter=($(cat $(echo $@ | grep -oE
 [[ ${all_parameter[*]} == "" ]] && echo 获取传入参数失败 && exit 1
 
 # 文件路径： jd_scripts diy 脚本和log等的保存路径
-workdir="/jd_sku/jd_scripts" && && [[ ! -d "$workdir" ]] && mkdir -p $workdir
+workdir="/jd_sku/jd_scripts" && [[ ! -d "$workdir" ]] && mkdir -p $workdir
 cookiefile="$workdir/cookie.file"
 composefile="$workdir/docker-compose.yml"
 
 # 基础工具和文件创建
-function() jd_sku_base{
-	apt update; apt install git curl wget -y
-	#
-	rm -rf $workdir
-	git clone https://github.com/mixool/jd_sku.git $workdir
+function jd_sku_base(){
+    apt update; apt install git curl wget -y
+    #
+    rm -rf $workdir
+    git clone https://github.com/mixool/jd_sku.git $workdir
 }
 
 # docker-compose.yml 所有支持的变量： jd_sku_var@ENABLE_AUTO_HELP@true jd_sku_var@TG_BOT_TOKEN@123456:AABB jd_sku_var@TG_USER_ID@-123456
-function() jd_sku_var{
-	varlist=($(echo ${all_parameter[*]} | grep -oE "jd_sku_var@[^@]+@[^ ]+" | tr "\n" " ")) && [[ ${#varlist[*]} == 0 ]] && return 0
-	for ((i = 0; i < ${#varlist[*]}; i++)); do
-		varname="$(echo ${varlist[i]} | cut -f2 -d@)"
-		varvalue="$(echo ${varlist[i]} | cut -f3 -d@)"
-		[[ $varname == "" || $varvalue == "" ]] && echo 变量 $varname $varvalue 参数无效 && continue
-		sed -i "/$varname.*/d" $composefile
-		echo "                - $varname=$varvalue" >>$composefile
-	done
-	cat $composefile
+function jd_sku_var(){
+    varlist=($(echo ${all_parameter[*]} | grep -oE "jd_sku_var@[^@]+@[^ ]+" | tr "\n" " ")) && [[ ${#varlist[*]} == 0 ]] && return 0
+    for ((i = 0; i < ${#varlist[*]}; i++)); do
+        varname="$(echo ${varlist[i]} | cut -f2 -d@)"
+        varvalue="$(echo ${varlist[i]} | cut -f3 -d@)"
+        [[ $varname == "" || $varvalue == "" ]] && echo 变量 $varname $varvalue 参数无效 && continue
+        sed -i "/$varname.*/d" $composefile
+        echo "                - $varname=$varvalue" >>$composefile
+    done
+    cat $composefile
 }
 
 # 从workdir目录下的cookie.file获取格式化后cookie导入docker-compose.yml,后期cookie过期维护使用: bash jdformat.sh jd_sku_initck
-function() jd_sku_initck{
-	cookies="$(cat $cookiefile | grep -vE "^#" | tr "\n" "&" | sed "s/&$//")"
-	sed -i "/JD_COOKIE.*/d" $composefile
-	echo "                - JD_COOKIE=$cookies" >>$composefile
-	cat $composefile
-	return 0
+function jd_sku_initck() {
+    cookies="$(cat $cookiefile | grep -vE "^#" | tr "\n" "&" | sed "s/&$//")"
+    sed -i "/JD_COOKIE.*/d" $composefile
+    echo "                - JD_COOKIE=$cookies" >>$composefile
+    cat $composefile
+    return 0
 }
 
-function() main{
-	echo ${all_parameter[*]} | grep -q "jd_sku_initck" && jd_sku_initck && exit 0
-	jd_sku_base
-	jd_sku_var
+function main() {
+    echo ${all_parameter[*]} | grep -q "jd_sku_initck" && jd_sku_initck && exit 0
+    jd_sku_base
+    jd_sku_var
 }
 
 main