Skip to content

Commit 82062a5

Browse files
committed
u
1 parent f226285 commit 82062a5

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

.github/workflows/lo-test.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
DEVICE: ${{ github.event.client_payload.device || github.event.inputs.device }}
2323
BRANCH: ${{ github.event.client_payload.branch || github.event.inputs.branch }}
2424
TG: ${{ secrets.TELEGRAM_BOT_TOKEN }}
25-
if: github.repository_owner=='klever1988'
25+
if: github.repository_owner=='stupidloud'
2626

2727
steps:
2828

@@ -50,10 +50,10 @@ jobs:
5050
- name: Checkout
5151
run: |
5252
cd
53-
curl -sL https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/zstd | sudo tee /usr/bin/zstd > /dev/null
53+
curl -sL https://raw.githubusercontent.com/stupidloud/nanopi-openwrt/zstd-bin/zstd | sudo tee /usr/bin/zstd > /dev/null
5454
for i in {1..20}
5555
do
56-
curl -sL --fail https://github.com/klever1988/sshactions/releases/download/cache/lede.$DEVICE.img.zst.0$i || break
56+
curl -sL --fail https://github.com/stupidloud/sshactions/releases/download/cache/lede.$DEVICE.img.zst.0$i || break
5757
done | zstdmt -d -o lede.img || (truncate -s 33g lede.img && mkfs.btrfs -M lede.img)
5858
LOOP_DEVICE=$(losetup -f) && echo "LOOP_DEVICE=$LOOP_DEVICE" >> $GITHUB_ENV
5959
sudo losetup -P --direct-io $LOOP_DEVICE lede.img
@@ -96,7 +96,7 @@ jobs:
9696
cat .config
9797
9898
- name: Debug via tmate
99-
uses: klever1988/ssh2actions@main
99+
uses: stupidloud/ssh2actions@main
100100
if: ${{ github.event.client_payload.debug == 'true' }}
101101
with:
102102
mode: ssh
@@ -170,7 +170,7 @@ jobs:
170170
sudo umount lede
171171
sudo losetup -d $LOOP_DEVICE
172172
export AUTH="Authorization: token ${{ secrets.SEC_TOKEN }}"
173-
export cache_path='github.com/repos/klever1988/sshactions/releases'
173+
export cache_path='github.com/repos/stupidloud/sshactions/releases'
174174
export cache_repo_id='39020554'
175175
#zstdmt -c --adapt --long lede.img | parallel --wc --block 1.99G --pipe \
176176
#'curl -s --data-binary @- -H "$AUTH" -H "Content-Type: application/octet-stream" https://uploads.$cache_path/$cache_repo_id/assets?name=lede.'$DEVICE'.img.zst.0{#} > /dev/null'
@@ -187,7 +187,7 @@ jobs:
187187
xargs -n1 -i curl -X DELETE -H "$AUTH" "https://api.$cache_path/assets/{}"
188188
ls *img.zst* ib-$DEVICE.tar.xz | parallel --wc 'while true; do curl -T {} -H "$AUTH" -H "Content-Type: application/octet-stream" "https://uploads.$cache_path/$cache_repo_id/assets?name={}" && break || true; done'
189189
set +e
190-
for i in {1..20}; do curl -sL --fail https://github.com/klever1988/sshactions/releases/download/cache/lede.$DEVICE.img.zst.0$i || break; done | zstdmt -d -o /dev/null
190+
for i in {1..20}; do curl -sL --fail https://github.com/stupidloud/sshactions/releases/download/cache/lede.$DEVICE.img.zst.0$i || break; done | zstdmt -d -o /dev/null
191191
if [ $? -eq 0 ]; then break; fi
192192
done
193193
set -e
@@ -198,7 +198,7 @@ jobs:
198198
curl -k --data chat_id="${{secrets.TELEGRAM_CHAT_ID}}" --data "text=The ${{env.DEVICE}} build ran completed at ${{job.status}}." "https://api.telegram.org/bot${{secrets.TELEGRAM_BOT_TOKEN}}/sendMessage"
199199
200200
- name: Debug via tmate
201-
uses: klever1988/ssh2actions@main
201+
uses: stupidloud/ssh2actions@main
202202
if: ${{ failure() && env.TG }}
203203
with:
204204
mode: ssh
@@ -228,7 +228,7 @@ jobs:
228228
sudo apt update && sudo apt install qemu-utils
229229
sudo sysctl vm.swappiness=0
230230
ulimit -SHn 65000
231-
curl -L https://github.com/klever1988/sshactions/releases/download/cache/ib-$DEVICE.tar.xz | tar -Jxvf -
231+
curl -L https://github.com/stupidloud/sshactions/releases/download/cache/ib-$DEVICE.tar.xz | tar -Jxvf -
232232
mv *imagebuilder* ib && cd ib
233233
. $GITHUB_WORKSPACE/scripts/merge_files.sh
234234
mkdir -p files/local_feed && sudo mount --bind packages files/local_feed
@@ -275,7 +275,7 @@ jobs:
275275
sudo apt update && sudo apt install qemu-utils
276276
sudo sysctl vm.swappiness=0
277277
ulimit -SHn 65000
278-
curl -L https://github.com/klever1988/sshactions/releases/download/cache/ib-$DEVICE.tar.xz | tar -Jxvf -
278+
curl -L https://github.com/stupidloud/sshactions/releases/download/cache/ib-$DEVICE.tar.xz | tar -Jxvf -
279279
set -x
280280
mv *imagebuilder* ib && cd ib
281281
. $GITHUB_WORKSPACE/scripts/merge_files.sh

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
- R2S加入了 https://github.com/NateLol/luci-app-oled 支持oled状态显示
4646

47-
![oled](https://github.com/klever1988/nanopi-openwrt/raw/master/assets/oled.jpg)
47+
![oled](https://github.com/stupidloud/nanopi-openwrt/raw/master/assets/oled.jpg)
4848

4949
## 2020-08-04
5050

@@ -92,7 +92,7 @@
9292

9393
- 今天暂停更新其他版本,只更新minimal版。内核打入Openwrt官方的鸡血补丁,NAT性能有了炸天的表现。
9494

95-
![boom](https://raw.githubusercontent.com/klever1988/nanopi-openwrt/master/assets/boom.jpg)
95+
![boom](https://raw.githubusercontent.com/stupidloud/nanopi-openwrt/master/assets/boom.jpg)
9696

9797
## 2020-03-01
9898

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[1分钟生成自己所需固件](#1分钟生成自己所需固件)
1010

1111
### 下载地址:
12-
https://github.com/klever1988/nanopi-openwrt/tags
12+
https://github.com/stupidloud/nanopi-openwrt/tags
1313
(img.gz档不需要解压,可以直接使用刷机工具刷入)
1414

1515
### 使用提示:
@@ -19,11 +19,11 @@ https://github.com/klever1988/nanopi-openwrt/tags
1919

2020
### 终端内在线升级方法:
2121
```bash
22-
wget -qO- https://github.com/klever1988/nanopi-openwrt/raw/master/scripts/autoupdate-bash.sh | bash
22+
wget -qO- https://github.com/stupidloud/nanopi-openwrt/raw/master/scripts/autoupdate-bash.sh | bash
2323
```
2424
slim版
2525
```bash
26-
wget -qO- https://github.com/klever1988/nanopi-openwrt/raw/master/scripts/autoupdate-bash.sh | ver=-slim bash
26+
wget -qO- https://github.com/stupidloud/nanopi-openwrt/raw/master/scripts/autoupdate-bash.sh | ver=-slim bash
2727
```
2828
(脚本由gary lau提供,非常感谢!)
2929

@@ -42,10 +42,10 @@ wget -qO- https://github.com/klever1988/nanopi-openwrt/raw/master/scripts/autoup
4242
再点击Run即可获取自己所需的固件
4343

4444
### 更新说明:
45-
https://github.com/klever1988/nanopi-openwrt/blob/master/CHANGELOG.md
45+
https://github.com/stupidloud/nanopi-openwrt/blob/master/CHANGELOG.md
4646

4747
#### 本固件NAT基准性能测试:
48-
<img src="https://raw.githubusercontent.com/klever1988/nanopi-openwrt/master/assets/NAT.jpg" width="450" />
48+
<img src="https://raw.githubusercontent.com/stupidloud/nanopi-openwrt/master/assets/NAT.jpg" width="450" />
4949

5050
#### 固件源码:
5151
https://github.com/coolsnowwolf/lede

scripts/autoupdate-bash.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ arch=`uname -m`
2626
mount -t tmpfs -o remount,size=850m tmpfs /tmp
2727
rm -rf /tmp/upg && mkdir /tmp/upg && cd /tmp/upg
2828

29-
latest_release_tag=`get_latest_release klever1988/nanopi-openwrt`
29+
latest_release_tag=`get_latest_release stupidloud/nanopi-openwrt`
3030
echo -e '\e[92m准备更新到'$latest_release_tag'\e[0m'
31-
md5sum=`wget https://ghproxy.com/https://github.com/klever1988/nanopi-openwrt/releases/download/$latest_release_tag/$board_id$ver.img.gz -O- | tee >(gzip -dc>$board_id.img) | md5sum | awk '{print $1}'`
31+
md5sum=`wget https://ghproxy.com/https://github.com/stupidloud/nanopi-openwrt/releases/download/$latest_release_tag/$board_id$ver.img.gz -O- | tee >(gzip -dc>$board_id.img) | md5sum | awk '{print $1}'`
3232
if [ "$md5sum" != "d41d8cd98f00b204e9800998ecf8427e" ]; then
33-
wget https://ghproxy.com/https://github.com/klever1988/nanopi-openwrt/releases/download/$latest_release_tag/$board_id$ver.img.gz.md5 -O md5sum.txt
33+
wget https://ghproxy.com/https://github.com/stupidloud/nanopi-openwrt/releases/download/$latest_release_tag/$board_id$ver.img.gz.md5 -O md5sum.txt
3434
echo -e '\e[92m'$latest_release_tag'固件已下载\e[0m'
3535
fi
3636

scripts/autoupdate.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ proceed_command sfdisk
1212
proceed_command losetup
1313
proceed_command resize2fs
1414
opkg install coreutils-truncate || true
15-
wget -NP /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/truncate
16-
wget -NP /tmp https://ghproxy.com/https://raw.githubusercontent.com/klever1988/nanopi-openwrt/zstd-bin/ddnz
15+
wget -NP /tmp https://ghproxy.com/https://raw.githubusercontent.com/stupidloud/nanopi-openwrt/zstd-bin/truncate
16+
wget -NP /tmp https://ghproxy.com/https://raw.githubusercontent.com/stupidloud/nanopi-openwrt/zstd-bin/ddnz
1717
chmod +x /tmp/truncate /tmp/ddnz
1818

1919
board_id=$(cat /etc/board.json | jsonfilter -e '@["model"].id' | sed 's/friendly.*,nanopi-//;s/xunlong,orangepi-//;s/^r1s-h5$/r1s/;s/^r1$/r1s-h3/;s/^r1-plus$/r1p/;s/^r1-plus-lts$/r1p-lts/;s/default-string-default-string/x86/;s/vmware-inc-vmware7-1/x86/')
@@ -22,15 +22,15 @@ arch=`uname -m`
2222
mount -t tmpfs -o remount,size=850m tmpfs /tmp
2323
rm -rf /tmp/upg && mkdir /tmp/upg && cd /tmp/upg
2424
set +e
25-
wget https://ghproxy.com/https://github.com/klever1988/nanopi-openwrt/releases/download/$(date +%Y-%m-%d)/$board_id$ver.img.gz -O- | gzip -dc > $board_id.img
25+
wget https://ghproxy.com/https://github.com/stupidloud/nanopi-openwrt/releases/download/$(date +%Y-%m-%d)/$board_id$ver.img.gz -O- | gzip -dc > $board_id.img
2626
if [ $? -eq 0 ]; then
27-
wget https://ghproxy.com/https://github.com/klever1988/nanopi-openwrt/releases/download/$(date +%Y-%m-%d)/$board_id$ver.img.md5 -O md5sum.txt
27+
wget https://ghproxy.com/https://github.com/stupidloud/nanopi-openwrt/releases/download/$(date +%Y-%m-%d)/$board_id$ver.img.md5 -O md5sum.txt
2828
echo -e '\e[92m今天固件已下载,准备解压\e[0m'
2929
else
3030
echo -e '\e[91m今天的固件还没更新,尝试下载昨天的固件\e[0m'
31-
wget https://ghproxy.com/https://github.com/klever1988/nanopi-openwrt/releases/download/$(date -d "@$(( $(busybox date +%s) - 86400))" +%Y-%m-%d)/$board_id$ver.img.gz -O- | gzip -dc > $board_id.img
31+
wget https://ghproxy.com/https://github.com/stupidloud/nanopi-openwrt/releases/download/$(date -d "@$(( $(busybox date +%s) - 86400))" +%Y-%m-%d)/$board_id$ver.img.gz -O- | gzip -dc > $board_id.img
3232
if [ $? -eq 0 ]; then
33-
wget https://ghproxy.com/https://github.com/klever1988/nanopi-openwrt/releases/download/$(date -d "@$(( $(busybox date +%s) - 86400))" +%Y-%m-%d)/$board_id$ver.img.md5 -O md5sum.txt
33+
wget https://ghproxy.com/https://github.com/stupidloud/nanopi-openwrt/releases/download/$(date -d "@$(( $(busybox date +%s) - 86400))" +%Y-%m-%d)/$board_id$ver.img.md5 -O md5sum.txt
3434
echo -e '\e[92m昨天的固件已下载,准备解压\e[0m'
3535
else
3636
echo -e '\e[91m没找到最新的固件,脚本退出\e[0m'

scripts/merge_packages.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ rm -rf package/custom; mkdir package/custom
3030
merge_feed nas "https://github.com/linkease/nas-packages;master"
3131
merge_feed nas_luci "https://github.com/linkease/nas-packages-luci;main"
3232
rm -r package/feeds/nas_luci/luci-app-ddnsto
33-
merge_feed helloworld "https://github.com/klever1988/helloworld;tmp"
34-
#merge_package https://github.com/klever1988/openwrt-mos/trunk/luci-app-mosdns
33+
merge_feed helloworld "https://github.com/stupidloud/helloworld;tmp"
34+
#merge_package https://github.com/stupidloud/openwrt-mos/trunk/luci-app-mosdns
3535
merge_package https://github.com/project-lede/luci-app-godproxy
3636
merge_package https://github.com/sundaqiang/openwrt-packages/trunk/luci-app-wolplus
3737
merge_package https://github.com/kuoruan/openwrt-frp frp

scripts/patches.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ case $status_page in
8080
*htm)
8181
line_number_FV=`grep -n 'Firmware Version' $status_page | cut -d: -f 1`
8282
sed -i '/ver\./d' $status_page
83-
sed -i $line_number_FV' a <a href="https://github.com/klever1988/nanopi-openwrt" target="_blank">klever1988/nanopi-openwrt</a> '$strDate $status_page
83+
sed -i $line_number_FV' a <a href="https://github.com/stupidloud/nanopi-openwrt" target="_blank">stupidloud/nanopi-openwrt</a> '$strDate $status_page
8484
;;
8585
*js)
8686
line_number_FV=`grep -m1 -n 'var fields' $status_page | cut -d: -f1`
87-
sed -i $line_number_FV' i var pfv = document.createElement('\''placeholder'\'');pfv.innerHTML = '\''<a href="https://github.com/klever1988/nanopi-openwrt" target="_blank">klever1988/nanopi-openwrt</a> '$strDate"';" $status_page
87+
sed -i $line_number_FV' i var pfv = document.createElement('\''placeholder'\'');pfv.innerHTML = '\''<a href="https://github.com/stupidloud/nanopi-openwrt" target="_blank">stupidloud/nanopi-openwrt</a> '$strDate"';" $status_page
8888
line_number_FV=`grep -n 'Firmware Version' $status_page | cut -d : -f 1`
8989
sed -i '/Firmware Version/d' $status_page
9090
sed -i $line_number_FV' a _('\''Firmware Version'\''), pfv,' $status_page

0 commit comments

Comments
 (0)