diff --git a/.gitignore b/.gitignore index 8e15fe7..35ba267 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ uwufetch uwufetch_* +*.gz *.core *.zip *.idea diff --git a/Makefile b/Makefile index 76faa1b..8a02105 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ lib: $(LIB_FILES) $(AR) rcs lib$(LIB_FILES:.c=.a) $(LIB_FILES:.c=.o) $(CC) $(CFLAGS) -shared -o lib$(LIB_FILES:.c=.so) $(LIB_FILES:.c=.o) -release: build +release: build man mkdir -pv $(NAME)_$(UWUFETCH_VERSION)-$(PLATFORM_ABBR) cp $(RELEASE_SCRIPTS) $(NAME)_$(UWUFETCH_VERSION)-$(PLATFORM_ABBR) cp -r res $(NAME)_$(UWUFETCH_VERSION)-$(PLATFORM_ABBR) @@ -102,7 +102,7 @@ debug: CFLAGS = $(CFLAGS_DEBUG) debug: build ./$(NAME) $(ARGS) -install: build +install: build man mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) $(ETC_DIR)/$(NAME) cp $(NAME) $(DESTDIR)/$(PREFIX) cp lib$(LIB_FILES:.c=.so) $(DESTDIR)/$(LIBDIR) @@ -127,8 +127,8 @@ ascii_debug: ls res/ascii/$(ASCII).txt | entr -c ./$(NAME) -d $(ASCII) man: - gzip --keep $(NAME).1 + sed "s/{DATE}/$(shell date '+%d %B %Y')/g" $(NAME).1 | sed "s/{UWUFETCH_VERSION}/$(UWUFETCH_VERSION)/g" | gzip > $(NAME).1.gz man_debug: @clear - man -P cat ./uwufetch.1 + man -P cat ./$(NAME).1 diff --git a/README.md b/README.md index 1af398d..ce8ebde 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ AmogOwOS, Nyalpine, Nyarch Linuwu, ArcOwO, Nyartix Linuwu, Debinyan, endevaOwO, ### Partial support (Either no ASCII art, or no image is provided) -Dewepyn, FemboyOS, KDE NeOwOn, nixOwOs, xuwulinux, Wocky Linuwu; Plus FweeBSD, OwOpenBSD, macOwOS and iOwOS; Plus WinyandOwOws. +Dewepyn, FemboyOWOS, KDE NeOwOn, nixOwOs, xuwulinux, Wocky Linuwu; Plus FweeBSD, OwOpenBSD, macOwOS and iOwOS; Plus WinyandOwOws. ## Building and installation diff --git a/default.config b/default.config index 7d86344..e6cb990 100644 --- a/default.config +++ b/default.config @@ -9,7 +9,7 @@ gpu=0 gpu=3 gpu=1 ram=true -resolution=true +resolution=false shell=true pkgs=true uptime=true diff --git a/uwufetch.1 b/uwufetch.1 index e8ac3e3..2e8c059 100644 --- a/uwufetch.1 +++ b/uwufetch.1 @@ -7,16 +7,13 @@ .\" I makes text appear in italic face .\" inline versions would look like \fBthis\fR and \fIthis\fR .\" EX and EE surrounds example section with text as is, with no empty lines in between the actual lines -.TH UWUFETCH 1 "27 August 2021" "1.4" "A meme system info tool for Linux" +.TH UWUFETCH 1 "{DATE}" "{UWUFETCH_VERSION}" "A meme system info tool for Linux" .SH DESCRIPTION UwUfetch is a program inspired by neofetch and ufetch, that takes system information and prints it in terminal in an UwU way, with either UwU ascii or image logo. .SH SYNOPSYS \fBuwufetch\fR [\fIOPTIONS\fR] [\fIARGUMENTS\fR] .SH OPTIONS .TP -.B -a --ascii -prints the logo as ascii text (default) -.TP .B -c --config you can change config path .TP @@ -33,14 +30,14 @@ works in most terminals, read README.md for more info .B -l --list prints a list of all supported distributions .TP +.B -r --read-cache +reads the cache file (~/.cache/uwufetch.cache) +.TP .B -v --version prints the current uwufetch version .TP -.B -w --write-cache writes to the cache file (~/.cache/uwufetch.cache) +.B -w --write-cache writes to the cache file (~/.cache/uwufetch.cache) -.TP -.B -w --write-cache writes to the cache file (~/.cache/uwufetch.cache) -reads from the cache file (~/.cache/uwufetch.cache) .SH CONFIGURATION The system-wide config file is /etc/uwufetch/config, and you can use it to configure uwufetch globally or as a template for your own config. The user config file is located in $HOME/.config/uwufetch/config (you need to create it), but you can change the path by using the \fB--config\fR option. @@ -48,8 +45,7 @@ The user config file is located in $HOME/.config/uwufetch/config (you need to cr .SH EXAMPLE .EX distro=arch -image=~/Pictures/picture.png -ascii=true +image=path/to/custom/image.png user=true os=true host=true @@ -70,6 +66,7 @@ Distribution name -d \fBoption\fR .TP .SH FULLY SUPPORTED .EX +AmogOwOs \fBamogos\fR Nyalpine \fBalpine\fR Nyarch Linuwu \fBarch\fR ArcOwO Linuwu \fBarcolinux\fR @@ -95,10 +92,12 @@ Unknown (tux logo) \fBunknown\fR .TP .SH IMAGE OR ASCII ONLY .EX -AmogOwOs \fBamogos\fR +Dewepyn \fBdeepin\fR +FemboyOWOS \fBfemboyos\fR KDE NeOwOn \fBneon\fR nixOwOs \fBnixos\fR xuwulinux \fBxerolinux\fR +Wocky Linuwu \fBrocky\fR FweeBSD \fBfreebsd\fR OwOpenBSD \fBopenbsd\fR macOwOS \fBmacos\fR @@ -113,15 +112,24 @@ uwufetch -id artix # uses Artix image logo (which is also uwu) .EE .SH DEPENDENCIES .TP 8 -.B lshw -better gpu info +.B freecolor +ram usage on FreeBSD +.TP +.B libc (required) +glibc on gnu systems or musl on non-gnu systems .TP .B viu print images instead of ascii logo .TP +.B xwininfo +get screen resolution +.TP +.B lshw +better gpu info +.TP .B kitty better image viewing .P -All of these dependencies are optional. There are no required dependencies. +All of these dependencies are optional. There are no required dependencies (except libc). .SH LICENSE AND COPYRIGHT uwufetch is provided under the GPL3 license, for copyright info read https://github.com/TheDarkBug/uwufetch/tree/main/res/COPYRIGHT.md. diff --git a/uwufetch.1.gz b/uwufetch.1.gz deleted file mode 100644 index 138c2d2..0000000 Binary files a/uwufetch.1.gz and /dev/null differ