From 4fc4b6f41e4f1b1a3ef42572be0a0386cf80052e Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 16 Sep 2021 09:39:08 +0800 Subject: [PATCH] fix append env vars Signed-off-by: Tianling Shen --- Makefile | 2 +- root/etc/init.d/unblockneteasemusic | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index efe6d85d..bccde145 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ LUCI_PKGARCH:=all PKG_NAME:=luci-app-unblockneteasemusic PKG_VERSION:=2.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Tianling Shen diff --git a/root/etc/init.d/unblockneteasemusic b/root/etc/init.d/unblockneteasemusic index 56031517..363a5824 100755 --- a/root/etc/init.d/unblockneteasemusic +++ b/root/etc/init.d/unblockneteasemusic @@ -35,7 +35,7 @@ append_param_arg() { append_param_env() { local value config_get value "$1" "$2" - [ -n "$value" ] && procd_set_param env "$3"="$value" + [ -n "$value" ] && procd_append_param env "$3"="$value" } uci_get_by_name() { @@ -93,6 +93,8 @@ start_service() append_param_arg "config" "proxy_server_ip" "-u" is_enabled "config" "strict_mode" && append_param "-s" + procd_set_param env LOG_FILE="/tmp/$NAME.log" + append_param_env "config" "joox_cookie" "JOOX_COOKIE" append_param_env "config" "migu_cookie" "MIGU_COOKIE" append_param_env "config" "qq_cookie" "QQ_COOKIE" @@ -100,16 +102,14 @@ start_service() append_param_env "config" "self_issue_cert_crt" "SIGN_CERT" append_param_env "config" "self_issue_cert_key" "SIGN_KEY" - is_enabled "config" "enable_flac" && procd_set_param env ENABLE_FLAC="true" + is_enabled "config" "enable_flac" && procd_append_param env ENABLE_FLAC="true" case "$(config_get "config" "replace_music_source")" in - "lower_than_192kbps") procd_set_param env MIN_BR="192000" ;; - "lower_than_320kbps") procd_set_param env MIN_BR="320000" ;; - "lower_than_999kbps") procd_set_param env MIN_BR="600000" ;; - "replace_all") procd_set_param env MIN_BR="9999999" ;; + "lower_than_192kbps") procd_append_param env MIN_BR="192000" ;; + "lower_than_320kbps") procd_append_param env MIN_BR="320000" ;; + "lower_than_999kbps") procd_append_param env MIN_BR="600000" ;; + "replace_all") procd_append_param env MIN_BR="9999999" ;; esac - procd_set_param env LOG_FILE="/tmp/$NAME.log" - procd_set_param stdout 1 procd_set_param stderr 1 procd_set_param respawn