diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh index a860fc2..af462bc 100755 --- a/Scripts/AutoBuild_DiyScript.sh +++ b/Scripts/AutoBuild_DiyScript.sh @@ -69,14 +69,15 @@ EOF # sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config # sed -i 's/luci-theme-bootstrap/luci-theme-argon-mod/g' feeds/luci/collections/luci/Makefile # sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon-mod"' $(PKG_Finder d package default-settings)/files/zzz-default-settings - + # AddPackage svn dir pkg_name user branch repo gitdir for i in eqos mentohust minieap unblockneteasemusic-go do - AddPackage svn apps luci-app-${i} immortalwrt/luci/branches/openwrt-18.06/applications + #AddPackage svn apps luci-app-${i} immortalwrt/luci/branches/openwrt-18.06/applications + AddPackage svn apps luci-app-${i} immortalwrt openwrt-18.06 luci applications sed -i 's/..\/..\//\$\(TOPDIR\)\/feeds\/luci\//g' ${WORK}/package/apps/luci-app-${i}/Makefile done ; unset i - AddPackage svn apps minieap immortalwrt/packages/branches/openwrt-18.06/net + AddPackage svn apps minieap immortalwrt openwrt-18.06 packages net AddPackage git other luci-theme-atmaterial-ColorIcon esirplayground master AddPackage git lean luci-app-argon-config jerrykuku master AddPackage git other OpenClash vernesong master diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index bfdedc1..8684971 100755 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -425,6 +425,8 @@ AddPackage() { PKG_NAME=$3 REPO_URL="https://github.com/$4" REPO_BRANCH=$5 + SVN_REPO_NAME=$6 + SVN_REPO_DIR=$7 [[ ${REPO_URL} =~ "${OP_AUTHOR}/${OP_REPO}" ]] && return 0 MKDIR ${PKG_DIR} @@ -445,7 +447,11 @@ AddPackage() { git clone -b ${REPO_BRANCH} ${PKG_URL} ${PKG_NAME} --depth=1 > /dev/null 2>&1 ;; svn) - svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1 + SVN_REPO_URL="$(echo ${REPO_URL}/${SVN_REPO_NAME} | sed s/[[:space:]]//g)" + git clone -b ${REPO_BRANCH} ${SVN_REPO_URL} --depth 1 --single-branch > /dev/null 2>&1 + cp ${SVN_REPO_NAME}/${SVN_REPO_DIR}/${PKG_NAME} ${PKG_NAME} -r + rm ${SVN_REPO_NAME} -rf + # svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1 ;; esac if [[ -f ${PKG_NAME}/Makefile || -n $(ls -A ${PKG_NAME}) ]]