From 49026b3a5be589a172dd01d9e27bf6b74f76c11b Mon Sep 17 00:00:00 2001 From: David Numan Date: Wed, 9 Mar 2011 16:40:15 -0500 Subject: [PATCH] Issue #1074908: Fixed broken cvs links to git --- drubuntu-bootstrap.sh | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drubuntu-bootstrap.sh b/drubuntu-bootstrap.sh index 86ffcee..d02d77a 100755 --- a/drubuntu-bootstrap.sh +++ b/drubuntu-bootstrap.sh @@ -15,7 +15,7 @@ echo read -n1 -p "Would you like to bootstrap the Drubuntu environment now? (y/n)" echo -PACKAGES="cvs php5-cli" +PACKAGES="git-core php5-cli" echo "Please enter your password to install $PACKAGES." sudo apt-get -y install $PACKAGES @@ -32,7 +32,7 @@ print($release["tag"]);' > /tmp/package_url.php # Download the XML for drush releases wget -q -m --timeout=30 -O/tmp/drush-release-history.xml "http://updates.drupal.org/release-history/drush/$CORE_VERSION" -# Download drush (we use cvs to encourage contribution) +# Download drush (we use git to encourage contribution) cd $DEFAULT_WORKSPACE if [ -d "$HOME/workspace/drush" ] ; then echo 'Backing up existing drush directory' @@ -40,7 +40,8 @@ if [ -d "$HOME/workspace/drush" ] ; then fi # Temporary pull from Drush HEAD pre-launch. -cvs -z6 -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal-contrib checkout -d drush contributions/modules/drush/ +git clone http://git.drupal.org/project/drush.git +#cvs -z6 -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal-contrib checkout -d drush contributions/modules/drush/ #cvs -z6 -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal-contrib checkout -d drush -r $(php /tmp/package_url.php) contributions/modules/drush/ rm /tmp/drush-release-history.xml /tmp/package_url.php @@ -64,7 +65,8 @@ if [ -d "$HOME/workspace/drubuntu" ] ; then echo 'Backing up existing drubuntu directory' mv drubuntu $HOME/.drubuntu/backups/`date +%Y%m%d%H%M%s`-drubuntu.backup fi -drush dl --package-handler=cvs drubuntu --destination=. +#note: --package-handler=csv doesn't work after git migration. commenting out this drush dl: drush dl --package-handler=cvs drubuntu --destination=. +git clone http://git.drupal.org/project/drubuntu.git ln -sfT $DEFAULT_WORKSPACE/drubuntu ~/.drush/drubuntu echo -- 1.7.1