From owner-svn-src-projects@FreeBSD.ORG Sun Nov 18 04:12:32 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 76964F70; Sun, 18 Nov 2012 04:12:32 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 358748FC08; Sun, 18 Nov 2012 04:12:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAI4CWsp048808; Sun, 18 Nov 2012 04:12:32 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAI4CWbQ048806; Sun, 18 Nov 2012 04:12:32 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201211180412.qAI4CWbQ048806@svn.freebsd.org> From: Mark Linimon Date: Sun, 18 Nov 2012 04:12:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243207 - projects/portbuild/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Nov 2012 04:12:32 -0000 Author: linimon (doc,ports committer) Date: Sun Nov 18 04:12:31 2012 New Revision: 243207 URL: http://svnweb.freebsd.org/changeset/base/243207 Log: Start parameterizing svn commands. Modified: projects/portbuild/scripts/updatesnap projects/portbuild/scripts/updatesnap.ports Modified: projects/portbuild/scripts/updatesnap ============================================================================== --- projects/portbuild/scripts/updatesnap Sun Nov 18 03:44:10 2012 (r243206) +++ projects/portbuild/scripts/updatesnap Sun Nov 18 04:12:31 2012 (r243207) @@ -74,17 +74,17 @@ for branch in $SRC_BRANCHES; do if [ ! -d ${mountpoint}/src ]; then mkdir ${mountpoint}/src || finish 1 fi - if [ ! -d ${mountpoint}/src/.svn ]; then + if [ ! -d ${mountpoint}/src/${VCS_SUBDIR} ]; then if [ $VERBOSE ]; then # XXX MCL 20121115 gotta do the substitution here, if it's not head! - echo "svn checkout svn://svn.freebsd.org/base/head ${mountpoint}/src" + echo "${VCS_CHECKOUT_COMMAND} ${VCS_SRC_REPOSITORY}/head ${mountpoint}/src" fi - svn checkout svn://svn.freebsd.org/base/head ${mountpoint}/src || finish 1 + ${VCS_CHECKOUT_COMMAND} ${VCS_SRC_REPOSITORY}/head ${mountpoint}/src || finish 1 else if [ $VERBOSE ]; then - echo "svn up ${mountpoint}/src" + echo "${VCS_UPDATE_COMMAND} ${mountpoint}/src" fi - svn up ${mountpoint}/src || finish 1 + ${VCS_UPDATE_COMMAND} ${mountpoint}/src || finish 1 fi echo ${fulldate} > src/.updated # hack for zfs breakiness Modified: projects/portbuild/scripts/updatesnap.ports ============================================================================== --- projects/portbuild/scripts/updatesnap.ports Sun Nov 18 03:44:10 2012 (r243206) +++ projects/portbuild/scripts/updatesnap.ports Sun Nov 18 04:12:31 2012 (r243207) @@ -67,16 +67,16 @@ fi cd ${head} fulldate=$(date) -if [ ! -d ${head}/ports/.svn ]; then +if [ ! -d ${head}/ports/${VCS_SUBDIR} ]; then if [ $VERBOSE ]; then - echo "svn checkout svn://svn.freebsd.org/ports/head ${head}/ports" + echo "${VCS_CHECKOUT_COMMAND} ${VCS_PORTS_REPOSITORY}/head ${head}/ports" fi - svn checkout svn://svn.freebsd.org/ports/head ${head}/ports || finish 1 + ${VCS_CHECKOUT_COMMAND} ${VCS_PORTS_REPOSITORY}/head ${head}/ports || finish 1 else if [ $VERBOSE ]; then - echo "svn up ${head}/ports" + echo "${VCS_UPDATE_COMMAND} ${head}/ports" fi - svn up ${head}/ports || finish 1 + ${VCS_UPDATE_COMMAND} ${head}/ports || finish 1 fi echo ${fulldate} > ports/.updated # hack for zfs breakiness