Fix: makefile and linux disk parse?

This commit is contained in:
Alastair Poole 2018-06-17 17:36:25 +01:00
parent f2a1d42771
commit 4d415c8b81
2 changed files with 12 additions and 6 deletions

View File

@ -22,6 +22,6 @@ clean:
$(MAKE) -C src clean $(MAKE) -C src clean
install: install:
cp data/evisum.png $(PREFIX)/share/icons install -m 0644 data/evisum.png $(PREFIX)/share/icons
cp data/evisum.desktop $(PREFIX)/share/applications install -m 0644 data/evisum.desktop $(PREFIX)/share/applications
cp evisum $(PREFIX)/bin install -m 0755 evisum $(PREFIX)/bin

View File

@ -232,14 +232,20 @@ disks_get(void)
char *name; char *name;
Eina_List *devs, *list; Eina_List *devs, *list;
char buf[4096]; char buf[4096];
const char *disk_search = "/dev/disk/by-uuid";
devs = ecore_file_ls(disk_search);
if (!devs)
{
disk_search = "/dev/disk/by-path";
devs = ecore_file_ls(disk_search);
}
list = NULL; list = NULL;
devs = ecore_file_ls("/dev/disk/by-path");
EINA_LIST_FREE(devs, name) EINA_LIST_FREE(devs, name)
{ {
snprintf(buf, sizeof(buf), "/dev/disk/by-path/%s", name); snprintf(buf, sizeof(buf), "%s/%s", disk_search, name);
char *real = realpath(buf, NULL); char *real = realpath(buf, NULL);
if (real) if (real)
{ {