MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 23:13:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix go installation check on amazon instance

Browse Source
This commit is contained in:
Harshavardhana 2015-07-05 18:12:58 -07:00
parent 46ab20dcee
commit 75788c7a1d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildscripts/checkdeps.sh
View File

@ -104,7 +104,12 @@ check_golang_env() {
exit -1 exit -1
fi fi
if [ "$(dirname ${go_binary_path})" != "${GOROOT%%*(/)}/bin" ] ; then local new_go_binary_path=${go_binary_path}
if [ -h "${go_binary_path}" ]; then
new_go_binary_path=$(/bin/readlink -f ${go_binary_path})
fi
if [[ !"$(dirname ${new_go_binary_path})" =~ *"${GOROOT%%*(/)}"* ]] ; then
echo "The go binary found in your PATH configuration does not belong to the Go installation pointed by your GOROOT environment," \ echo "The go binary found in your PATH configuration does not belong to the Go installation pointed by your GOROOT environment," \
"please refer to Go installation document" "please refer to Go installation document"
echo "https://github.com/minio/minio/blob/master/INSTALLGO.md#install-go-13" echo "https://github.com/minio/minio/blob/master/INSTALLGO.md#install-go-13"

3
pkg/utils/scsi/scsi.go
View File

@ -52,7 +52,8 @@ func GetDisks() (Disks, error) {
sysFiles, err := ioutil.ReadDir(sysFSDEVICES) sysFiles, err := ioutil.ReadDir(sysFSDEVICES)
if err != nil { if err != nil {
return Disks{}, iodine.New(err, nil) // may be an amazon instance, ignore this
return Disks{}, nil
} }
scsidevices = filterdisks(sysFiles) scsidevices = filterdisks(sysFiles)