From ca9c10ceee0b3dd4e175be67c779155b273dd232 Mon Sep 17 00:00:00 2001 From: Joshua Bussdieker Date: Thu, 2 Feb 2012 05:56:08 -0800 Subject: [PATCH] Mac compatability --- scripts/install | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index e0adbd5..e933b83 100755 --- a/scripts/install +++ b/scripts/install @@ -12,7 +12,7 @@ download_source() { GO_SOURCE_URL=https://go.googlecode.com/hg/ [ -d $GO_CACHE_PATH ] && return echo "Downloading Go source..." - hg clone $GO_SOURCE_URL $GO_CACHE_PATH &>> $GVM_ROOT/logs/go-download.log || + hg clone $GO_SOURCE_URL $GO_CACHE_PATH >> $GVM_ROOT/logs/go-download.log 2>&1 || display_error "Couldn't download Go source" } @@ -22,12 +22,12 @@ check_tag() { update_source() { echo "Updating Go source..." - hg pull -R $GO_CACHE_PATH &>> $GVM_ROOT/logs/go-download.log || + hg pull -R $GO_CACHE_PATH >> $GVM_ROOT/logs/go-download.log 2>&1 || display_error "Couldn't get latest Go version info" } copy_source() { - cp -r -T $GO_CACHE_PATH $GO_INSTALL_ROOT &>> $GVM_ROOT/logs/go-$version-install.log || + cp -r -T $GO_CACHE_PATH $GO_INSTALL_ROOT >> $GVM_ROOT/logs/go-$version-install.log 2>&1 || display_error "Couldn't copy source to target folder" } @@ -68,15 +68,15 @@ install_go() { echo "Installing $version..." # Create the target folder - mkdir -p $GO_INSTALL_ROOT &>> $GVM_ROOT/logs/go-$version-install.log || + mkdir -p $GO_INSTALL_ROOT >> $GVM_ROOT/logs/go-$version-install.log 2>&1 || display_error "Couldn't create target folder" # Create the global package set folder - mkdir -p $GVM_ROOT/pkgsets/$version &>> $GVM_ROOT/logs/go-$version-install.log || + mkdir -p $GVM_ROOT/pkgsets/$version >> $GVM_ROOT/logs/go-$version-install.log 2>&1 || display_error "Couldn't create global package set folder" # Copy the source and checkout the version copy_source - hg checkout $version -R $GO_INSTALL_ROOT &>> $GVM_ROOT/logs/go-$version-install.log || + hg checkout $version -R $GO_INSTALL_ROOT >> $GVM_ROOT/logs/go-$version-install.log 2>&1 || (rm -rf $GO_INSTALL_ROOT && display_error "Couldn't checkout version") compile_go