diff --git a/_addons.config b/_addons.config index 9e22e33..9dc2a5f 100644 --- a/_addons.config +++ b/_addons.config @@ -15,6 +15,9 @@ CONFIG_FEED__alpine_fan_control=m ### luci-theme-argon #GIT_PACKAGE luci-theme-argon=https://github.com/openwrt-xiaomi/luci-theme-argon.git master +### luci-app-argon-config +#GIT_PACKAGE luci-app-argon-config=https://github.com/openwrt-xiaomi/luci-app-argon-config.git master + ### luci-app-tn-netports #GIT_PACKAGE luci-app-tn-netports=https://github.com/openwrt-xiaomi/luci-app-tn-netports.git master diff --git a/_argon.config b/_argon.config index baa5412..549ca95 100644 --- a/_argon.config +++ b/_argon.config @@ -1,2 +1,3 @@ ### Argon Theme CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-app-argon-config=y diff --git a/r3d.config b/r3d.config index ec9850a..79e6b21 100644 --- a/r3d.config +++ b/r3d.config @@ -38,7 +38,7 @@ CONFIG_PACKAGE_luci-app-sqm=y CONFIG_PACKAGE_luci-i18n-sqm-ru=y ### TimeControl -CONFIG_PACKAGE_luci-app-timecontrol=y +##CONFIG_PACKAGE_luci-app-timecontrol=y ### qBittorrent CONFIG_PACKAGE_boost=y @@ -56,3 +56,7 @@ CONFIG_PACKAGE_dnsmasq-full=y ### CPU Freq CONFIG_PACKAGE_luci-app-cpufreq=y + + + + diff --git a/r3d_menu.json b/r3d_menu.json new file mode 100644 index 0000000..6780dfe --- /dev/null +++ b/r3d_menu.json @@ -0,0 +1,15 @@ +{ + "nas": { + "title": "NAS", + "order": 45, + "items": [ + [ "nas", "filebrowser" ], + [ "services", "samba4" ], + [ "services", "transmission" ], + [ "system", "diskman" ], + [ "services", "disks-info" ], + [ "services", "hd_idle" ], + [ "services", "minidlna" ] + ] + } +} diff --git a/xmake.sh b/xmake.sh index cfeb63b..1641ef9 100755 --- a/xmake.sh +++ b/xmake.sh @@ -46,6 +46,12 @@ if [ $( get_cfg_pkg_flag "$XDIR/.config" "dnsmasq-full" ) = "y" ]; then sed -i '/CONFIG_PACKAGE_dnsmasq=y/d' $XDIR/.config fi +rm -f $XDIR/luci_aux_menu.json +TARGET_MENU="$XDIR"/"$XTARGET""_menu.json" +if [ -f "$TARGET_MENU" ]; then + cp -f "$TARGET_MENU" $XDIR/luci_aux_menu.json +fi + if [ -z "$MAKE_JOBS" ]; then MAKE_JOBS=$( grep processor /proc/cpuinfo | tail -n 1 | awk '{print $3}' ) fi diff --git a/xupdate.sh b/xupdate.sh index d38da84..2e957d9 100755 --- a/xupdate.sh +++ b/xupdate.sh @@ -70,9 +70,15 @@ if [ "$CLONE_ADDONS" = "true" ]; then fi if [ "$OPT_FULL_UPDATE" = "true" ]; then - ./vermagic_update.sh ipq806x generic - ./vermagic_update.sh ramips mt7621 - ./vermagic_update.sh mediatek mt7622 + if [ -f "$XDIR/vermagic_update.sh" ]; then + ./vermagic_update.sh ipq806x generic + ./vermagic_update.sh ramips mt7621 + ./vermagic_update.sh mediatek mt7622 + fi +fi + +if [ -f "$XDIR/luci_dispatcher.sh" ]; then + ./luci_dispatcher.sh fi echo "All git sources updated!"