fix(config): changed path to list of mounted devices

Wittano · Nov 28, 2023 · 18334bd · 18334bd
1 parent feafb0d
commit 18334bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/internal/linux/mounted.go b/internal/linux/mounted.go
@@ -13,7 +13,7 @@ type FileSystem struct {
 }
 
 func MountedList() (fss []FileSystem, err error) {
-	f, err := os.Open("/etc/mtab")
+	f, err := os.Open("/proc/mounts")
 	if err != nil {
 		return nil, err
 	}

diff --git a/setting/config_file_test.go b/setting/config_file_test.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/wittano/filebot/internal/test"
 	"os"
-	"strings"
 	"testing"
 )
 
@@ -35,12 +34,11 @@ func TestFailedLoadingConfig(t *testing.T) {
 }
 
 func TestGetTrashDir(t *testing.T) {
-	destDir := t.TempDir()
 	tempFile := test.CreateTempFile(t)
 
 	d := Directory{
 		Src:         []string{tempFile},
-		Dest:        destDir,
+		Dest:        t.TempDir(),
 		MoveToTrash: true,
 	}
 
@@ -53,12 +51,7 @@ func TestGetTrashDir(t *testing.T) {
 		t.Fatal("MoveToTrash field is false")
 	}
 
-	var exp string
-	if strings.Contains(destDir, "/tmp") {
-		exp = fmt.Sprintf("/tmp/.Trash-%d/files", os.Getuid())
-	} else {
-		exp = fmt.Sprintf("%s/.local/share/.Trash-%d/files", os.Getenv("HOME"), os.Getuid())
-	}
+	exp := fmt.Sprintf("/tmp/.Trash-%d/files", os.Getuid())
 
 	if exp != res {
 		t.Fatalf("Trash dir is diffrent. Expected: %s, Actually: %s", exp, res)