Merge pull request #622 from konimex/master

Makefile

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

neofetch

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