From 4fe7e90012f34cf86184f1c9ca2af3c5bfd1300b Mon Sep 17 00:00:00 2001
From: klever1988 <56048681+klever1988@users.noreply.github.com>
Date: Thu, 19 Aug 2021 21:47:17 +0800
Subject: [PATCH] Update merge_files.sh

---
 merge_files.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/merge_files.sh b/merge_files.sh
index e2cb3b8..27bf52d 100644
--- a/merge_files.sh
+++ b/merge_files.sh
@@ -1,20 +1,12 @@
 mv $GITHUB_WORKSPACE/files ./
-if [ $DEVICE = 'r2s' ]; then
+if [ $DEVICE = 'r2s' -o $DEVICE = 'r2c' ]; then
     mkdir -p files/usr/bin files/etc/init.d files/etc/rc.d
     wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/usr/bin/start-rk3328-pwm-fan.sh -qNP files/usr/bin
     chmod +x files/usr/bin/start-rk3328-pwm-fan.sh
     wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/etc/init.d/fa-rk3328-pwmfan -qNP files/etc/init.d
     chmod +x files/etc/init.d/fa-rk3328-pwmfan
     ln -sf ../init.d/fa-rk3328-pwmfan files/etc/rc.d/S96fa-rk3328-pwmfan
-    fi
-if [ $DEVICE = 'r2c' ]; then
-    mkdir -p files/usr/bin files/etc/init.d files/etc/rc.d
-    wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/usr/bin/start-rk3328-pwm-fan.sh -qNP files/usr/bin
-    chmod +x files/usr/bin/start-rk3328-pwm-fan.sh
-    wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/etc/init.d/fa-rk3328-pwmfan -qNP files/etc/init.d
-    chmod +x files/etc/init.d/fa-rk3328-pwmfan
-    ln -sf ../init.d/fa-rk3328-pwmfan files/etc/rc.d/S96fa-rk3328-pwmfan
-   fi 
+fi
 if [ $DEVICE = 'r4s' ]; then
     mkdir -p files/usr/bin files/etc/init.d files/etc/rc.d
     wget https://raw.githubusercontent.com/btyh17mxy/friendlywrt/fix/rk3399-fan-ctl/target/linux/rockchip-rk3399/base-files/usr/bin/start-rk3399-pwm-fan.sh -qNP files/usr/bin