macOS location is '/usr/local/lib' and the rest is back to '/usr/lib'

This commit is contained in:
hellisabove 2022-01-29 12:33:19 +02:00
parent dd8a1646d8
commit 460a17d04d
2 changed files with 10 additions and 6 deletions

View file

@ -6,8 +6,8 @@ CC = cc
DESTDIR = /usr
ifeq ($(shell uname), Linux)
PREFIX = local/bin
LIBDIR = local/lib
PREFIX = bin
LIBDIR = lib
MANDIR = share/man/man1
else ifeq ($(shell uname), Darwin)
PREFIX = local/bin
@ -16,8 +16,8 @@ else ifeq ($(shell uname), Darwin)
else ifeq ($(shell uname), FreeBSD)
CFLAGS += -D__FREEBSD__
CFLAGS_DEBUG += -D__FREEBSD__
PREFIX = local/bin
LIBDIR = local/lib
PREFIX = bin
LIBDIR = lib
MANDIR = share/man/man1
else ifeq ($(shell uname), windows32)
CC = gcc

View file

@ -325,8 +325,10 @@ void print_image(struct info* user_info) {
else {
if (strcmp(user_info->os_name, "android") == 0)
sprintf(command, "viu -t -w 18 -h 8 /data/data/com.termux/files/usr/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for android
else if (strcmp(user_info->os_name, "macos") == 0)
sprintf(command, "viu -t -w 18 -h 8 /usr/local/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name);
else
sprintf(command, "viu -t -w 18 -h 8 /usr/local/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for other systems
sprintf(command, "viu -t -w 18 -h 8 /usr/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for other systems
}
printf("\n");
if (system(command) != 0) // if viu is not installed or the image is missing
@ -631,8 +633,10 @@ void print_ascii(struct info* user_info) {
if (!file) { // if the file does not exist in the local directory, open it from the installation directory
if (strcmp(user_info->os_name, "android") == 0)
sprintf(ascii_file, "/data/data/com.termux/files/usr/lib/uwufetch/ascii/%s.txt", user_info->os_name);
else
else if (strcmp(user_info->os_name, "macos") == 0)
sprintf(ascii_file, "/usr/local/lib/uwufetch/ascii/%s.txt", user_info->os_name);
else
sprintf(ascii_file, "/usr/lib/uwufetch/ascii/%s.txt", user_info->os_name);
file = fopen(ascii_file, "r");
if (!file) {