From 0e67952b8673428647b29d8b0b19850ed90ddc5c Mon Sep 17 00:00:00 2001
From: wy580477 <98247050+wy580477@users.noreply.github.com>
Date: Sun, 3 Jul 2022 20:28:01 +0800
Subject: [PATCH] Bug fixes

---
 Dockerfile                | 1 -
 Dockerfile.lite           | 1 -
 content/install.sh        | 4 +++-
 content/service/caddy/run | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1ab3a9e..7c52a58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,6 @@ RUN apk add --no-cache curl caddy jq runit tzdata fuse p7zip bash findutils \
     && pipx install --pip-args='--no-cache-dir' gallery-dl \
     && apk del .build-deps \
     && wget -O - https://github.com/mayswind/AriaNg/releases/download/1.2.4/AriaNg-1.2.4.zip | busybox unzip -qd /workdir/ariang - \
-    && sed -i 's|6800|443|g' /workdir/ariang/js/aria-ng-a87a79b0e7.min.js \
     && wget -O - https://github.com/rclone/rclone-webui-react/releases/download/v2.0.5/currentbuild.zip | busybox unzip -qd /workdir/rcloneweb - \
     && wget -O - https://github.com/bastienwirtz/homer/releases/latest/download/homer.zip | busybox unzip -qd /workdir/homer - \
     && wget -O - https://github.com/WDaan/VueTorrent/releases/latest/download/vuetorrent.zip | busybox unzip -qd /workdir - \
diff --git a/Dockerfile.lite b/Dockerfile.lite
index 0a9da1c..c12cbf2 100644
--- a/Dockerfile.lite
+++ b/Dockerfile.lite
@@ -19,7 +19,6 @@ RUN apk add --no-cache curl caddy jq runit tzdata fuse bash findutils \
     && python3 -m pip install --user --no-cache-dir pipx \
     && pipx install --pip-args='--no-cache-dir' gallery-dl \
     && wget -O - https://github.com/mayswind/AriaNg/releases/download/1.2.4/AriaNg-1.2.4.zip | busybox unzip -qd /workdir/ariang - \
-    && sed -i 's|6800|443|g' /workdir/ariang/js/aria-ng-a87a79b0e7.min.js \
     && wget -O - https://github.com/rclone/rclone-webui-react/releases/download/v2.0.5/currentbuild.zip | busybox unzip -qd /workdir/rcloneweb - \
     && wget -O - https://github.com/bastienwirtz/homer/releases/latest/download/homer.zip | busybox unzip -qd /workdir/homer - \
     && wget -O - https://github.com/WDaan/VueTorrent/releases/latest/download/vuetorrent.zip | busybox unzip -qd /workdir - \
diff --git a/content/install.sh b/content/install.sh
index 6f5ab35..798c4bc 100644
--- a/content/install.sh
+++ b/content/install.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -x
+
 DIR_TMP="$(mktemp -d)"
 
 OS_type="$(uname -m)"
@@ -14,7 +16,7 @@ case "$OS_type" in
     OS_type='arm64'
     OS_type2='aarch64'
     OS_type3='arm64'
-    OS_type3='arm64'
+    OS_type4='arm64'
     ;;
   arm*)
     OS_type='arm-v7'
diff --git a/content/service/caddy/run b/content/service/caddy/run
index 65c3948..abb697a 100644
--- a/content/service/caddy/run
+++ b/content/service/caddy/run
@@ -1,8 +1,9 @@
 #!/bin/sh
 
 # Configure AriaNG & Rclone WebUI
+sed -i 's|6800|'"${CADDY_WEB_PORT}"'|g' /workdir/ariang/js/aria-ng-a87a79b0e7.min.js
 sed -i 's|rpcInterface:"jsonrpc"|rpcInterface:"'"${GLOBAL_PORTAL_PATH/\//}"'/jsonrpc"|g' /workdir/ariang/js/aria-ng-a87a79b0e7.min.js
-sed -i 's|ipAddress:a|ipAddress:`${window.location.protocol}//${window.location.hostname}'"${GLOBAL_PORTAL_PATH}"'/rclonerc`|g' /workdir/rcloneweb/build/static/js/3.90421092.chunk.js
+sed -i 's|ipAddress:a|ipAddress:`${window.location.protocol}//${window.location.hostname}:'"${CADDY_WEB_PORT}"''"${GLOBAL_PORTAL_PATH}"'/rclonerc`|g' /workdir/rcloneweb/build/static/js/3.90421092.chunk.js
 
 # Configure homer
 cp /workdir/homer_conf/* /workdir/homer/assets/tools/