From 0e7ccd927bcdefe8c29b523487a4e789a80f7c8d Mon Sep 17 00:00:00 2001
From: songchenwen <me@songchenwen.com>
Date: Fri, 17 Apr 2020 12:57:22 +0800
Subject: [PATCH] + FileAssistant -Watchcat

---
 .github/workflows/friendlywrt.yml               | 2 +-
 .github/workflows/friendlywrt_with_features.yml | 2 +-
 features.seed                                   | 2 +-
 luci-app-r2sflasher/root/usr/bin/rom_flash      | 2 +-
 minimal_config.seed                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/friendlywrt.yml b/.github/workflows/friendlywrt.yml
index 15cbfae..de00699 100644
--- a/.github/workflows/friendlywrt.yml
+++ b/.github/workflows/friendlywrt.yml
@@ -11,7 +11,7 @@ on:
       - 'minimal_config.seed'
       - '*.sh'
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 17 * * *'
 
 jobs:
   build:
diff --git a/.github/workflows/friendlywrt_with_features.yml b/.github/workflows/friendlywrt_with_features.yml
index 9c740ec..88eee5d 100644
--- a/.github/workflows/friendlywrt_with_features.yml
+++ b/.github/workflows/friendlywrt_with_features.yml
@@ -11,7 +11,7 @@ on:
       - 'features.seed'
       - '*.sh'
   schedule:
-    - cron: '0 0 * * 1'
+    - cron: '50 19 * * 1'
 
 jobs:
   build:
diff --git a/features.seed b/features.seed
index 7b5ad2e..03f0fd6 100644
--- a/features.seed
+++ b/features.seed
@@ -112,11 +112,11 @@ CONFIG_PACKAGE_luci-app-filetransfer=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-app-ramfree=y
 CONFIG_PACKAGE_luci-app-netdata=y
-CONFIG_PACKAGE_luci-app-watchcat=y
 CONFIG_PACKAGE_luci-app-vlmcsd=y
 CONFIG_PACKAGE_luci-app-wol=y
 CONFIG_PACKAGE_luci-app-wrtbwmon=y
 CONFIG_PACKAGE_luci-app-serverchan=y
+CONFIG_PACKAGE_luci-app-fileassistant=y
 CONFIG_PACKAGE_luci-app-r2sflasher=y
 CONFIG_PACKAGE_luci-app-passwall=y
 CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Brook=y
diff --git a/luci-app-r2sflasher/root/usr/bin/rom_flash b/luci-app-r2sflasher/root/usr/bin/rom_flash
index 8e7608b..4c476ca 100755
--- a/luci-app-r2sflasher/root/usr/bin/rom_flash
+++ b/luci-app-r2sflasher/root/usr/bin/rom_flash
@@ -181,7 +181,7 @@ if [ -f "$zstfile" ]; then
     fi
 
     echo "开始刷机, 请不要断电或关机, 如果刷机失败请取出 SD 卡用电脑重新写入 ROM"
-    pv -f -F "刷机中请不要断电或关机 %e %p" -i 1 "$zstfile" | zstdcat | dd of=/dev/mmcblk0 conv=fsync
+    pv -f -F "刷机中, 请不要断电或关机 %e %p" -i 1 "$zstfile" | zstdcat | dd of=/dev/mmcblk0 conv=fsync
     echo "刷机完毕, 正在重启, 请稍候..."
     sleep 5
     echo o > /proc/sysrq-trigger
diff --git a/minimal_config.seed b/minimal_config.seed
index 4fe0c38..d879344 100644
--- a/minimal_config.seed
+++ b/minimal_config.seed
@@ -112,11 +112,11 @@ CONFIG_PACKAGE_luci-app-filetransfer=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-app-ramfree=y
 CONFIG_PACKAGE_luci-app-netdata=y
-CONFIG_PACKAGE_luci-app-watchcat=y
 CONFIG_PACKAGE_luci-app-vlmcsd=y
 CONFIG_PACKAGE_luci-app-wol=y
 CONFIG_PACKAGE_luci-app-wrtbwmon=y
 CONFIG_PACKAGE_luci-app-serverchan=y
+CONFIG_PACKAGE_luci-app-fileassistant=y
 CONFIG_PACKAGE_luci-app-r2sflasher=y
 CONFIG_PACKAGE_luci-app-passwall=y
 CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Brook=y
-- 
GitLab