fix #2799 curl's urlencode not work

vernesong · Nov 16, 2022 · c0c8a70 · c0c8a70
1 parent 484756b
commit c0c8a70
Show file tree

Hide file tree

Showing 4 changed files with 188 additions and 182 deletions.
diff --git a/luci-app-openclash/root/usr/share/openclash/openclash.sh b/luci-app-openclash/root/usr/share/openclash/openclash.sh
@@ -37,12 +37,8 @@ only_download=0
 set_lock
 
 urlencode() {
-   local data
    if [ "$#" -eq 1 ]; then
-      data=$(curl -s -o /dev/null -w %{url_effective} --get --data-urlencode "key=$1" "")
-      if [ ! -z "$data" ]; then
-         echo -n "$(echo ${data##/?key=} |sed 's/\//%2f/g' |sed 's/:/%3a/g' |sed 's/?/%3f/g' |sed 's/(/%28/g' |sed 's/)/%29/g' |sed 's/\^/%5e/g' |sed 's/=/%3d/g' |sed 's/|/%7c/g' |sed 's/+/%20/g')"
-      fi
+      echo "$(/usr/share/openclash/openclash_urlencode.lua "$1")"
    fi
 }
 

diff --git a/luci-app-openclash/root/usr/share/openclash/openclash_download_rule_list.sh b/luci-app-openclash/root/usr/share/openclash/openclash_download_rule_list.sh
@@ -3,12 +3,8 @@
 . /lib/functions.sh
 
 urlencode() {
-   local data
    if [ "$#" -eq 1 ]; then
-      data=$(curl -s -o /dev/null -w %{url_effective} --get --data-urlencode "key=$1" "")
-      if [ ! -z "$data" ]; then
-         echo -n "$(echo ${data##/?key=} |sed 's/\//%2f/g' |sed 's/:/%3a/g' |sed 's/?/%3f/g' |sed 's/(/%28/g' |sed 's/)/%29/g' |sed 's/\^/%5e/g' |sed 's/=/%3d/g' |sed 's/|/%7c/g' |sed 's/+/%20/g')"
-      fi
+      echo "$(/usr/share/openclash/openclash_urlencode.lua "$1")"
    fi
 }