mirror of
https://github.com/wahyd4/gvm.git
synced 2026-08-09 04:46:19 +10:00
Mac compatability
This commit is contained in:
+6
-6
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user