Skip to content

Commit 32ff31f

Browse files
committed
builds: S99FirstBoot: Fix Beta/Stable Editions
Signed-off-by: Eliminater74 <eliminater74@gmail.com>
1 parent 62e9be6 commit 32ff31f

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/build-openwrt.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,8 @@ jobs:
396396
working-directory: '/workdir/openwrt'
397397
if: env.DEFAULT_BRANCH == env.BRANCH_BETA && !cancelled()
398398
run: |
399-
sed -i 's/BRANCH="stable"/BRANCH="$DEFAULT_BRANCH"/g' "$GITHUB_WORKSPACE"/openwrt/files/etc/rc.d/S99kmods
399+
sed -i 's/BRANCH="stable"/BRANCH="'"$DEFAULT_BRANCH"'"/g' "$GITHUB_WORKSPACE"/openwrt/files/etc/rc.d/S99FirstBoot
400+
sed -i 's/BRANCH="stable"/BRANCH="'"$DEFAULT_BRANCH"'"/g' "$GITHUB_WORKSPACE"/openwrt/files/etc/rc.d/S99kmods
400401
### ----------------------------------------------------------------- ###
401402
### [ STABLE BRANCH ]
402403
- name: Branch Stable
@@ -406,7 +407,8 @@ jobs:
406407
chmod +x "$GITHUB_WORKSPACE"/scripts/$FUNCTIONS_SH
407408
source "$GITHUB_WORKSPACE"/scripts/$FUNCTIONS_SH
408409
SWITCH_KERNEL
409-
sed -i 's/BRANCH="beta"/BRANCH="$DEFAULT_BRANCH"/g' "$GITHUB_WORKSPACE"/openwrt/files/etc/rc.d/S99kmods
410+
sed -i 's/BRANCH="beta"/BRANCH="'"$DEFAULT_BRANCH"'"/g' "$GITHUB_WORKSPACE"/openwrt/files/etc/rc.d/S99FirstBoot
411+
sed -i 's/BRANCH="beta"/BRANCH="'"$DEFAULT_BRANCH"'"/g' "$GITHUB_WORKSPACE"/openwrt/files/etc/rc.d/S99kmods
410412
### ----------------------------------------------------------------- ###
411413
- name: Cache Key Get/Check
412414
working-directory: '/workdir/openwrt'

configs/files/etc/rc.d/S99FirstBoot

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# See /LICENSE for more information. #
88
# #
99
# #
10-
# Updated By Eliminater74 07/31/2022 #
10+
# Updated By Eliminater74 08/20/2022 #
1111
#################################################################
1212

1313

@@ -17,6 +17,8 @@
1717

1818
[ ! -e "/root/FIRST_BOOT" ] || exit
1919

20+
BRANCH="stable"
21+
2022
# Prompt colors
2123
sed -i 's/^export PS1.*/export PS1='\''\\\[\\033\[01;31m\\\]\\h\\\[\\033\[01;30m\\\]@\\\[\\033\[01;32m\\\]\\w\\\[\\033\[01;34m\\\] #\\\[\\033\[00m\\\] '\''/' /etc/profile
2224

@@ -70,11 +72,11 @@ rm -f /usr/lib/lua/luci/view/admin_status/index/mwan.htm
7072
rm -f /usr/lib/lua/luci/view/admin_status/index/upnp.htm
7173

7274
# add package database to distfeeds.conf
73-
echo 'src/gz purefusion_packages https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/main/packages/packages' >> /etc/opkg/distfeeds.conf
74-
echo 'src/gz purefusion_base https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/main/packages/base' >> /etc/opkg/distfeeds.conf
75-
echo 'src/gz purefusion_luci https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/main/packages/luci' >> /etc/opkg/distfeeds.conf
76-
echo 'src/gz purefusion_routing https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/main/packages/routing' >> /etc/opkg/distfeeds.conf
77-
echo 'src/gz purefusion_telephony https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/main/packages/telephony' >> /etc/opkg/distfeeds.conf
75+
echo "src/gz purefusion_packages https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/$BRANCH/packages/packages" >> /etc/opkg/distfeeds.conf
76+
echo "src/gz purefusion_base https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/$BRANCH/packages/base" >> /etc/opkg/distfeeds.conf
77+
echo "src/gz purefusion_luci https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/$BRANCH/packages/luci" >> /etc/opkg/distfeeds.conf
78+
echo "src/gz purefusion_routing https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/$BRANCH/packages/routing" >> /etc/opkg/distfeeds.conf
79+
echo "src/gz purefusion_telephony https://raw.githubusercontent.com/DevOpenWRT-Router/Linksys_OpenWRT_Releases/$BRANCH/packages/telephony" >> /etc/opkg/distfeeds.conf
7880

7981
echo "$(uci -q get uhttpd.main.index_page)" | grep -q "cgi-bin/luci" ||
8082
uci -q add_list uhttpd.main.index_page='cgi-bin/luci' && uci commit uhttpd

0 commit comments

Comments
 (0)