Merge pull request #123 from harshavardhana/pr_out_use_helper_homedir_

master
Harshavardhana 10 years ago
commit c26b6f3d76
  1. 12
      pkg/server/server.go
  2. 15
      pkg/utils/helpers/common.go
  3. 2
      pkg/utils/helpers/execpipe.go
  4. 2
      pkg/utils/helpers/execpipe_test.go

@ -19,7 +19,6 @@ package server
import (
"log"
"os"
"os/user"
"path"
"reflect"
@ -29,6 +28,7 @@ import (
mstorage "github.com/minio-io/minio/pkg/storage"
"github.com/minio-io/minio/pkg/storage/fs"
"github.com/minio-io/minio/pkg/storage/inmemory"
"github.com/minio-io/minio/pkg/utils/helpers"
)
type ServerConfig struct {
@ -128,13 +128,9 @@ func getStorageChannels(storageType StorageType) (ctrlChans []chan<- string, sta
}
case storageType == FileStorage:
{
// TODO Replace this with a more configurable and robust version
currentUser, err := user.Current()
if err != nil {
log.Fatal(err)
}
rootPath := path.Join(currentUser.HomeDir, "minio-storage")
_, err = os.Stat(rootPath)
homeDir := helpers.HomeDir()
rootPath := path.Join(homeDir, "minio-storage")
_, err := os.Stat(rootPath)
if os.IsNotExist(err) {
err = os.Mkdir(rootPath, 0700)
} else if err != nil {

@ -14,14 +14,27 @@
* limitations under the License.
*/
package utils
package helpers
import (
"io/ioutil"
"log"
"os"
"runtime"
"strings"
)
func HomeDir() string {
if runtime.GOOS == "windows" {
home := os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH")
if home == "" {
home = os.Getenv("USERPROFILE")
}
return home
}
return os.Getenv("HOME")
}
func MakeTempTestDir() (string, error) {
return ioutil.TempDir("/tmp", "minio-test-")
}

@ -14,7 +14,7 @@
* limitations under the License.
*/
package utils
package helpers
import (
"bytes"

@ -14,7 +14,7 @@
* limitations under the License.
*/
package utils
package helpers
import (
"io/ioutil"
Loading…
Cancel
Save