kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #622 from konimex/master

Browse source 
Config: Move default config to /etc (#620)
This commit is contained in:
Dylan Araps 2017-01-18 12:52:00 +11:00 committed by GitHub
commit 41316aaf16
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Makefile
View file

@ -1,24 +1,20 @@
PREFIX ?= /usr PREFIX = /usr
RM ?= rm -f
INSTALL_DIR ?= install -m755 -d
INSTALL_PROG ?= install -m755
INSTALL_FILE ?= install -m644
all: all:
@echo Run \'make install\' to install Neofetch @echo Run \'make install\' to install Neofetch
install: install:
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin mkdir -p $(DESTDIR)$(PREFIX)/bin
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1 mkdir -p $(DESTDIR)/etc/neofetch
$(INSTALL_PROG) neofetch $(DESTDIR)$(PREFIX)/bin/neofetch mkdir -p $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro
$(INSTALL_FILE) neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1 cp -p neofetch $(DESTDIR)$(PREFIX)/bin/neofetch
$(INSTALL_FILE) config/config $(DESTDIR)$(PREFIX)/share/neofetch/config cp -p neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1
$(INSTALL_FILE) ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro cp -p config/config $(DESTDIR)/etc/neofetch/config
cp -p ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro
uninstall: uninstall:
$(RM) $(DESTDIR)$(PREFIX)/bin/neofetch rm -f $(DESTDIR)$(PREFIX)/bin/neofetch
$(RM) $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1 rm -f $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1
$(RM) -r $(DESTDIR)$(PREFIX)/share/neofetch rm -f -r $(DESTDIR)$(PREFIX)/share/neofetch
rm -f -r $(DESTDIR)/etc/neofetch

8
neofetch
View file

@ -3269,14 +3269,14 @@ get_script_dir() {
} }
get_default_config() { get_default_config() {
if [[ -f "/usr/share/neofetch/config" ]]; then if [[ -f "/etc/neofetch/config" ]]; then
default_config="/usr/share/neofetch/config" default_config="/etc/neofetch/config"
elif [[ -f "/usr/local/share/neofetch/config" ]]; then elif [[ -f "/usr/local/share/neofetch/config" ]]; then
default_config="/usr/local/share/neofetch/config" default_config="/usr/local/share/neofetch/config"
elif [[ -f "/data/data/com.termux/files/usr/share/neofetch/config" ]]; then elif [[ -f "/data/data/com.termux/files/etc/neofetch/config" ]]; then
default_config="/data/data/com.termux/files/usr/share/neofetch/config" default_config="/data/data/com.termux/files/etc/neofetch/config"
else else
get_script_dir get_script_dir