d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refine the VCSUPDATE logic further:

Browse Source 
- Look for the .git directory instead of top-level directory.
- Use 'git -C' instead of cd(1).

Sponsored by:	Rubicon Communications, LLC (netgate.com)
This commit is contained in:
Glen Barber 2020-08-29 16:04:02 +00:00
parent 91edfc6ca5
commit 8ea469ebbb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=364960
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
release/release.sh
View File

@ -221,22 +221,22 @@ chroot_setup() {
mkdir -p ${CHROOTDIR}/usr
if [ -z "${SRC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/src" ]; then
cd ${CHROOTDIR}/usr/src && ${VCSUPDATE} && cd -
if [ -d "${CHROOTDIR}/usr/src/.git" ]; then
${VCSUPDATE} -C ${CHROOTDIR}/usr/src
else
${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
fi
fi
if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/doc" ]; then
cd ${CHROOTDIR}/usr/doc && ${VCSUPDATE} && cd -
if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
${VCSUPDATE} -C ${CHROOTDIR}/usr/doc
else
${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
fi
fi
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/ports" ]; then
cd ${CHROOTDIR}/usr/ports && ${VCSUPDATE} && cd -
if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
${VCSUPDATE} -C ${CHROOTDIR}/usr/ports
else
${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
fi