diff --git a/diy-mini.sh b/diy-mini.sh index d8bd3904d7..1ec8f5de1f 100644 --- a/diy-mini.sh +++ b/diy-mini.sh @@ -17,32 +17,40 @@ rm -rf feeds/luci/themes/luci-theme-argon rm -rf feeds/luci/applications/luci-app-mosdns rm -rf feeds/luci/applications/luci-app-netdata +# Git稀疏克隆，只克隆指定目录到本地 +function git_sparse_clone() { + branch="$1" repourl="$2" && shift 2 + git clone --depth=1 -b $branch --single-branch --sparse $repourl + repodir=$(echo $repourl | awk -F '/' '{print $(NF)}') + cd $repodir && git sparse-checkout set $@ + mv -f $@ ../package + cd .. && rm -rf $repodir +} + # 添加额外插件 git clone --depth=1 https://github.com/kongfl888/luci-app-adguardhome package/luci-app-adguardhome git clone --depth=1 https://github.com/Jason6111/luci-app-netdata package/luci-app-netdata -# svn export https://github.com/syb999/openwrt-19.07.1/trunk/package/network/services/msd_lite package/msd_lite +# git_sparse_clone master https://github.com/syb999/openwrt-19.07.1 package/network/services/msd_lite # 科学上网插件 git clone --depth=1 -b main https://github.com/fw876/helloworld package/luci-app-ssr-plus -svn export https://github.com/haiibo/packages/trunk/luci-app-vssr package/luci-app-vssr -git clone --depth=1 https://github.com/jerrykuku/lua-maxminddb package/lua-maxminddb git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall-packages package/openwrt-passwall -svn export https://github.com/xiaorouji/openwrt-passwall/trunk/luci-app-passwall package/luci-app-passwall -svn export https://github.com/xiaorouji/openwrt-passwall2/trunk/luci-app-passwall2 package/luci-app-passwall2 -svn export https://github.com/vernesong/OpenClash/trunk/luci-app-openclash package/luci-app-openclash +git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall package/luci-app-passwall +git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall2 package/luci-app-passwall2 +git_sparse_clone master https://github.com/vernesong/OpenClash luci-app-openclash # Themes git clone --depth=1 -b 18.06 https://github.com/kiddin9/luci-theme-edge package/luci-theme-edge git clone --depth=1 -b 18.06 https://github.com/jerrykuku/luci-theme-argon package/luci-theme-argon git clone --depth=1 https://github.com/jerrykuku/luci-app-argon-config package/luci-app-argon-config git clone --depth=1 https://github.com/xiaoqingfengATGH/luci-theme-infinityfreedom package/luci-theme-infinityfreedom -svn export https://github.com/haiibo/packages/trunk/luci-theme-opentomcat package/luci-theme-opentomcat +git_sparse_clone main https://github.com/haiibo/packages luci-theme-opentomcat # 更改 Argon 主题背景 cp -f $GITHUB_WORKSPACE/images/bg1.jpg package/luci-theme-argon/htdocs/luci-static/argon/img/bg1.jpg # 晶晨宝盒 -svn export https://github.com/ophub/luci-app-amlogic/trunk/luci-app-amlogic package/luci-app-amlogic +git_sparse_clone main https://github.com/ophub/luci-app-amlogic luci-app-amlogic sed -i "s|firmware_repo.*|firmware_repo 'https://github.com/haiibo/OpenWrt'|g" package/luci-app-amlogic/root/etc/config/amlogic # sed -i "s|kernel_path.*|kernel_path 'https://github.com/ophub/kernel'|g" package/luci-app-amlogic/root/etc/config/amlogic sed -i "s|ARMv8|ARMv8_MINI|g" package/luci-app-amlogic/root/etc/config/amlogic @@ -56,19 +64,17 @@ git clone --depth=1 https://github.com/ximiTech/luci-app-msd_lite package/luci-a git clone --depth=1 https://github.com/ximiTech/msd_lite package/msd_lite # MosDNS -svn export https://github.com/sbwml/luci-app-mosdns/trunk/luci-app-mosdns package/luci-app-mosdns -svn export https://github.com/sbwml/luci-app-mosdns/trunk/mosdns package/mosdns +git clone --depth=1 https://github.com/sbwml/luci-app-mosdns package/luci-app-mosdns # Alist -svn export https://github.com/sbwml/luci-app-alist/trunk/luci-app-alist package/luci-app-alist -svn export https://github.com/sbwml/luci-app-alist/trunk/alist package/alist +git clone --depth=1 https://github.com/sbwml/luci-app-alist package/luci-app-alist # iStore -svn export https://github.com/linkease/istore-ui/trunk/app-store-ui package/app-store-ui -svn export https://github.com/linkease/istore/trunk/luci package/luci-app-store +git_sparse_clone main https://github.com/linkease/istore-ui app-store-ui +git_sparse_clone main https://github.com/linkease/istore luci # 在线用户 -svn export https://github.com/haiibo/packages/trunk/luci-app-onliner package/luci-app-onliner +git_sparse_clone main https://github.com/haiibo/packages luci-app-onliner sed -i '$i uci set nlbwmon.@nlbwmon[0].refresh_interval=2s' package/lean/default-settings/files/zzz-default-settings sed -i '$i uci commit nlbwmon' package/lean/default-settings/files/zzz-default-settings chmod 755 package/luci-app-onliner/root/usr/share/onliner/setnlbw.sh diff --git a/diy-script.sh b/diy-script.sh index 3124daf6f6..41f2ea74d1 100644 --- a/diy-script.sh +++ b/diy-script.sh @@ -19,6 +19,16 @@ rm -rf feeds/luci/applications/luci-app-mosdns rm -rf feeds/luci/applications/luci-app-netdata rm -rf feeds/luci/applications/luci-app-serverchan +# Git稀疏克隆，只克隆指定目录到本地 +function git_sparse_clone() { + branch="$1" repourl="$2" && shift 2 + git clone --depth=1 -b $branch --single-branch --sparse $repourl + repodir=$(echo $repourl | awk -F '/' '{print $(NF)}') + cd $repodir && git sparse-checkout set $@ + mv -f $@ ../package + cd .. && rm -rf $repodir +} + # 添加额外插件 git clone --depth=1 https://github.com/kongfl888/luci-app-adguardhome package/luci-app-adguardhome git clone --depth=1 -b openwrt-18.06 https://github.com/tty228/luci-app-wechatpush package/luci-app-serverchan @@ -26,34 +36,29 @@ git clone --depth=1 https://github.com/ilxp/luci-app-ikoolproxy package/luci-app git clone --depth=1 https://github.com/esirplayground/luci-app-poweroff package/luci-app-poweroff git clone --depth=1 https://github.com/destan19/OpenAppFilter package/OpenAppFilter git clone --depth=1 https://github.com/Jason6111/luci-app-netdata package/luci-app-netdata -svn export https://github.com/Lienol/openwrt-package/trunk/luci-app-filebrowser package/luci-app-filebrowser -svn export https://github.com/Lienol/openwrt-package/trunk/luci-app-ssr-mudb-server package/luci-app-ssr-mudb-server -svn export https://github.com/immortalwrt/luci/branches/openwrt-18.06/applications/luci-app-eqos package/luci-app-eqos -# svn export https://github.com/syb999/openwrt-19.07.1/trunk/package/network/services/msd_lite package/msd_lite +git_sparse_clone main https://github.com/Lienol/openwrt-package luci-app-filebrowser luci-app-ssr-mudb-server +git_sparse_clone openwrt-18.06 https://github.com/immortalwrt/luci applications/luci-app-eqos +# git_sparse_clone master https://github.com/syb999/openwrt-19.07.1 package/network/services/msd_lite # 科学上网插件 git clone --depth=1 -b main https://github.com/fw876/helloworld package/luci-app-ssr-plus -svn export https://github.com/haiibo/packages/trunk/luci-app-vssr package/luci-app-vssr -git clone --depth=1 https://github.com/jerrykuku/lua-maxminddb package/lua-maxminddb git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall-packages package/openwrt-passwall -svn export https://github.com/xiaorouji/openwrt-passwall/trunk/luci-app-passwall package/luci-app-passwall -svn export https://github.com/xiaorouji/openwrt-passwall2/trunk/luci-app-passwall2 package/luci-app-passwall2 -svn export https://github.com/vernesong/OpenClash/trunk/luci-app-openclash package/luci-app-openclash +git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall package/luci-app-passwall +git clone --depth=1 https://github.com/xiaorouji/openwrt-passwall2 package/luci-app-passwall2 +git_sparse_clone master https://github.com/vernesong/OpenClash luci-app-openclash # Themes git clone --depth=1 -b 18.06 https://github.com/kiddin9/luci-theme-edge package/luci-theme-edge git clone --depth=1 -b 18.06 https://github.com/jerrykuku/luci-theme-argon package/luci-theme-argon git clone --depth=1 https://github.com/jerrykuku/luci-app-argon-config package/luci-app-argon-config git clone --depth=1 https://github.com/xiaoqingfengATGH/luci-theme-infinityfreedom package/luci-theme-infinityfreedom -svn export https://github.com/haiibo/packages/trunk/luci-theme-atmaterial package/luci-theme-atmaterial -svn export https://github.com/haiibo/packages/trunk/luci-theme-opentomcat package/luci-theme-opentomcat -svn export https://github.com/haiibo/packages/trunk/luci-theme-netgear package/luci-theme-netgear +git_sparse_clone main https://github.com/haiibo/packages luci-theme-atmaterial luci-theme-opentomcat luci-theme-netgear # 更改 Argon 主题背景 cp -f $GITHUB_WORKSPACE/images/bg1.jpg package/luci-theme-argon/htdocs/luci-static/argon/img/bg1.jpg # 晶晨宝盒 -svn export https://github.com/ophub/luci-app-amlogic/trunk/luci-app-amlogic package/luci-app-amlogic +git_sparse_clone main https://github.com/ophub/luci-app-amlogic luci-app-amlogic sed -i "s|firmware_repo.*|firmware_repo 'https://github.com/haiibo/OpenWrt'|g" package/luci-app-amlogic/root/etc/config/amlogic # sed -i "s|kernel_path.*|kernel_path 'https://github.com/ophub/kernel'|g" package/luci-app-amlogic/root/etc/config/amlogic sed -i "s|ARMv8|ARMv8_PLUS|g" package/luci-app-amlogic/root/etc/config/amlogic @@ -67,23 +72,21 @@ git clone --depth=1 https://github.com/ximiTech/luci-app-msd_lite package/luci-a git clone --depth=1 https://github.com/ximiTech/msd_lite package/msd_lite # MosDNS -svn export https://github.com/sbwml/luci-app-mosdns/trunk/luci-app-mosdns package/luci-app-mosdns -svn export https://github.com/sbwml/luci-app-mosdns/trunk/mosdns package/mosdns - -# DDNS.to -svn export https://github.com/linkease/nas-packages-luci/trunk/luci/luci-app-ddnsto package/luci-app-ddnsto -svn export https://github.com/linkease/nas-packages/trunk/network/services/ddnsto package/ddnsto +git clone --depth=1 https://github.com/sbwml/luci-app-mosdns package/luci-app-mosdns # Alist -svn export https://github.com/sbwml/luci-app-alist/trunk/luci-app-alist package/luci-app-alist -svn export https://github.com/sbwml/luci-app-alist/trunk/alist package/alist +git clone --depth=1 https://github.com/sbwml/luci-app-alist package/luci-app-alist + +# DDNS.to +git_sparse_clone main https://github.com/linkease/nas-packages-luci luci/luci-app-ddnsto +git_sparse_clone master https://github.com/linkease/nas-packages network/services/ddnsto # iStore -svn export https://github.com/linkease/istore-ui/trunk/app-store-ui package/app-store-ui -svn export https://github.com/linkease/istore/trunk/luci package/luci-app-store +git_sparse_clone main https://github.com/linkease/istore-ui app-store-ui +git_sparse_clone main https://github.com/linkease/istore luci # 在线用户 -svn export https://github.com/haiibo/packages/trunk/luci-app-onliner package/luci-app-onliner +git_sparse_clone main https://github.com/haiibo/packages luci-app-onliner sed -i '$i uci set nlbwmon.@nlbwmon[0].refresh_interval=2s' package/lean/default-settings/files/zzz-default-settings sed -i '$i uci commit nlbwmon' package/lean/default-settings/files/zzz-default-settings chmod 755 package/luci-app-onliner/root/usr/share/onliner/setnlbw.sh