lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #72 from github/git-media-tmp

Browse Source 
put git-media's tmp in the media dir
This commit is contained in:
risk danger olson 2014-06-12 11:37:17 -06:00
commit c00f4f9291
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commands/env_test.go
View File

@ -20,7 +20,7 @@ func TestEnv(t *testing.T) {
"LocalWorkingDir": repo.Path,
"LocalGitDir": filepath.Join(repo.Path, ".git"),
"LocalMediaDir": filepath.Join(repo.Path, ".git", "media"),
"TempDir": filepath.Join(os.TempDir(), "git-media"),
"TempDir": filepath.Join(repo.Path, ".git", "media", "tmp"),
})
}
@ -34,7 +34,7 @@ func TestEnvWithMediaUrl(t *testing.T) {
"LocalWorkingDir": repo.Path,
"LocalGitDir": filepath.Join(repo.Path, ".git"),
"LocalMediaDir": filepath.Join(repo.Path, ".git", "media"),
"TempDir": filepath.Join(os.TempDir(), "git-media"),
"TempDir": filepath.Join(repo.Path, ".git", "media", "tmp"),
})
}
@ -48,7 +48,7 @@ func TestEnvWithSubmoduleFromRepository(t *testing.T) {
"LocalWorkingDir": repo.Path,
"LocalGitDir": filepath.Join(repo.Path, ".git"),
"LocalMediaDir": filepath.Join(repo.Path, ".git", "media"),
"TempDir": filepath.Join(os.TempDir(), "git-media"),
"TempDir": filepath.Join(repo.Path, ".git", "media", "tmp"),
})
cmd.Before(func() {
@ -73,7 +73,7 @@ func TestEnvWithSubmoduleFromSubmodule(t *testing.T) {
"LocalWorkingDir": repo.Path,
"LocalGitDir": filepath.Join(repo.Path, ".git"),
"LocalMediaDir": filepath.Join(repo.Path, ".git", "media"),
"TempDir": filepath.Join(os.TempDir(), "git-media"),
"TempDir": filepath.Join(repo.Path, ".git", "media", "tmp"),
})
cmd.Before(func() {

1
gitmedia/gitmedia.go
View File

@ -60,6 +60,7 @@ func init() {
if err == nil {
LocalMediaDir = filepath.Join(LocalGitDir, "media")
LocalLogDir = filepath.Join(LocalMediaDir, "logs")
TempDir = filepath.Join(LocalMediaDir, "tmp")
queueDir = setupQueueDir()
if err := os.MkdirAll(TempDir, 0744); err != nil {