Add Separated Read Me File to Avoid Merge Conflict

FriendlyWRT/README.md

+# FriendlyWRT
+
+以官方固件为基础, 添加 Lean 的包
+
+[下载地址](https://github.com/songchenwen/nanopi-r2s/releases/download/FriendlyWRT-2020-04-15-06ca030/FriendlyWRT-2020-04-15-06ca030-ROM.zip)
+
+[改动记录](CHANGELOG.md)

FwF/README.md

+# FwF
+
+FriendlyWRT with Features
+
+在[FriendlyWRT](../FriendlyWRT)的基础上，添加了更多功能。
+
+[下载地址](https://github.com/songchenwen/nanopi-r2s/releases/download/FwF-2020-04-14-c5c7214/FwF-2020-04-14-c5c7214-ROM.zip)
+
+[改动记录](CHANGELOG.md)

LOL/README.md

+# LOL
+
+以 [Lienol on Lean](https://github.com/Lienol/openwrt/tree/dev-lean-lede) 为基础, 增加 FriendlyWRT 对 OpenWRT 的改动
+
+[下载地址](https://github.com/songchenwen/nanopi-r2s/releases/download/LOL-2020-04-15-06ca030/LOL-2020-04-15-06ca030-ROM.zip)
+
+[改动记录](CHANGELOG.md)

Lean/README.md

+# Lean 
+
+以 Lean 为基础, 增加 FriendlyWRT 对 OpenWRT 的改动
+
+[下载地址](https://github.com/songchenwen/nanopi-r2s/releases/download/Lean-2020-04-14-b7c1390/Lean-2020-04-14-b7c1390-ROM.zip)
+
+[改动记录](CHANGELOG.md)

README.md

@@ -12,11 +12,11 @@ FriendlyWRT 和 FwF 是基于官方固件的版本，主要求稳，没有解锁
 点击下方固件名字，可找到对应版本固件的最新下载链接。图形化刷机工具 [luci-app-r2sflasher](luci-app-r2sflasher) 的 ipk 安装包也在下载到的 zip 里。推荐下载 FriendlyWRT 的版本。
 
 | 推荐 | 固件名字 | 改动记录 | 简介 |
-| :--- | :------ | :----- | :--- |
-| * | [FriendlyWRT](https://github.com/songchenwen/nanopi-r2s/releases/tag/FriendlyWRT-2020-04-15-06ca030) | [改动记录](FriendlyWRT/CHANGELOG.md) | 以官方固件为基础, 添加 Lean 的包 |
-| * | [FwF](https://github.com/songchenwen/nanopi-r2s/releases/tag/FwF-2020-04-14-c5c7214) | [改动记录](FwF/CHANGELOG.md) | FriendlyWRT with Features, 比上面的固件含有更多功能 |
-|   | [Lean](https://github.com/songchenwen/nanopi-r2s/releases/tag/Lean-2020-04-14-b7c1390) | [改动记录](Lean/CHANGELOG.md) | 以 Lean 为基础, 增加 FriendlyWRT 对 OpenWRT 的改动 | 
-|   | [LOL](https://github.com/songchenwen/nanopi-r2s/releases/tag/LOL-2020-04-15-06ca030) | [改动记录](LOL/CHANGELOG.md) | 以[Lienol on Lean](https://github.com/Lienol/openwrt/tree/dev-lean-lede)为基础, 增加 FriendlyWRT 对 OpenWRT 的改动 |
+| :---: | :------ | :----- | :--- |
+| * | [FriendlyWRT](FriendlyWRT) | [改动记录](FriendlyWRT/CHANGELOG.md) | 以官方固件为基础, 添加 Lean 的包 |
+| * | [FwF](FwF) | [改动记录](FwF/CHANGELOG.md) | FriendlyWRT with Features, 比上面的固件含有更多功能 |
+|   | [Lean](Lean) | [改动记录](Lean/CHANGELOG.md) | 以 Lean 为基础, 增加 FriendlyWRT 对 OpenWRT 的改动 | 
+|   | [LOL](LOL) | [改动记录](LOL/CHANGELOG.md) | 以[Lienol on Lean](https://github.com/Lienol/openwrt/tree/dev-lean-lede)为基础, 增加 FriendlyWRT 对 OpenWRT 的改动 |
 
 默认 LAN 口 IP `192.168.2.1` 默认密码 `password`
 

changelog.sh

@@ -108,10 +108,10 @@ printf '%s\n%s\n' "$ChangeLogFull" "$(cat $ChangeLogFile)" >$ChangeLogFile
 rm $StatusFile
 mv $NewStatusFile $StatusFile
 
-sed -i -E "s/(releases\/tag\/)${VARIANTNAME}-[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9a-f]+/\1${BuildTag}/" README.md
+sed -i -E "s/(releases\/download\/)${VARIANTNAME}-[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9a-f]+\/${VARIANTNAME}-[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9a-f]+-ROM.zip/\1${BuildTag}\/${BuildTag}-ROM.zip/" ${VARIANTNAME}/README.md
 
 git add $StatusFile
 git add $ChangeLogFile
-git add README.md
+git add ${VARIANTNAME}/README.md
 git commit -m "ChangeLog for $BuildTag"
 # git push

luci-app-r2sflasher/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-r2sflasher
-PKG_VERSION:=1
-PKG_RELEASE:=1
-PKG_DATE:=20200413
+PKG_VERSION:=1.0
+PKG_RELEASE:=2
+PKG_DATE:=20200415
 
 include $(INCLUDE_DIR)/package.mk