From 96103a757f43c194860fffa7f52f9a65576fee40 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 20 Jun 2017 15:14:45 +0700 Subject: [PATCH] Misc: Removed Makefile and added install script --- Makefile | 20 -------------------- install.sh | 31 +++++++++++++++++++++++++++++++ neofetch | 38 ++++++++------------------------------ 3 files changed, 39 insertions(+), 50 deletions(-) delete mode 100644 Makefile create mode 100755 install.sh diff --git a/Makefile b/Makefile deleted file mode 100644 index b7d4105f..00000000 --- a/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -PREFIX = /usr - -all: - @echo Run \'make install\' to install Neofetch - -install: - 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 -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 diff --git a/install.sh b/install.sh new file mode 100755 index 00000000..99a7baa9 --- /dev/null +++ b/install.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +while [[ "$1" ]]; do + case "$1" in + "--destdir") DESTDIR="$2" ;; + "--bindir") BINDIR="$2" ;; + "--confdir") CONFDIR="$2" ;; + "--prefix") PREFIX="$2" ;; + "--asciidir") ASCIIDIR="$2" ;; + "--mandir") MANDIR="$2" ;; + esac + shift +done + +[[ -z "$BINDIR" ]] && BINDIR="/usr/bin" +[[ -z "$CONFDIR" ]] && CONFDIR="/etc/neofetch" +[[ -z "$ASCIIDIR" ]] && ASCIIDIR="/usr/share/neofetch/ascii/distro" +[[ -z "$MANDIR" ]] && MANDIR="/usr/share/man/man1" + +mkdir -p "${DESTDIR}""${PREFIX}""${BINDIR}" +mkdir -p "${DESTDIR}""${PREFIX}""${CONFDIR}" +mkdir -p "${DESTDIR}""${PREFIX}""${ASCIIDIR}" +mkdir -p "${DESTDIR}""${PREFIX}""${MANDIR}" + +sed -i -e "s|CONFDIR|/${PREFIX}${CONFDIR}|g" neofetch +sed -i -e "s|ASCIIDIR|/${PREFIX}${ASCIIDIR}|g" neofetch + +cp -p neofetch "${DESTDIR}""${PREFIX}""${BINDIR}" +cp -p config/config "${DESTDIR}""${PREFIX}""${CONFDIR}" +cp -p ascii/distro/* "${DESTDIR}""${PREFIX}""${ASCIIDIR}" +cp -p neofetch.1 "${DESTDIR}""${PREFIX}""${MANDIR}" diff --git a/neofetch b/neofetch index f53ff1c7..1627499f 100755 --- a/neofetch +++ b/neofetch @@ -2171,18 +2171,9 @@ get_ascii() { [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ err "Image: Source is image file but ascii backend was selected. Using distro ascii." - if [[ -d "/usr/share/neofetch/ascii/distro" ]]; then - ascii_dir="/usr/share/neofetch/ascii/distro" - - elif [[ -d "/usr/local/share/neofetch/ascii/distro" ]]; then - ascii_dir="/usr/local/share/neofetch/ascii/distro" - - elif [[ -d "/data/data/com.termux/files/usr/share/neofetch/ascii/distro" ]]; then - ascii_dir="/data/data/com.termux/files/usr/share/neofetch/ascii/distro" - - elif [[ -d "/boot/home/config/non-packaged/share/neofetch/ascii/distro" ]]; then - ascii_dir="/boot/home/config/non-packaged/share/neofetch/ascii/distro" - + # Note: ASCIIDIR here is a placeholder -- it will be replaced with your ASCII directory. + if [[ -d "ASCIIDIR" ]]; then + ascii_dir="ASCIIDIR" else [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" ascii_dir="${script_dir%/*}/ascii/distro" @@ -3565,18 +3556,9 @@ get_full_path() { } get_default_config() { - if [[ -f "/etc/neofetch/config" ]]; then - default_config="/etc/neofetch/config" - - elif [[ -f "/usr/local/etc/neofetch/config" ]]; then - default_config="/usr/local/etc/neofetch/config" - - elif [[ -f "/data/data/com.termux/files/usr/etc/neofetch/config" ]]; then - default_config="/data/data/com.termux/files/usr/etc/neofetch/config" - - elif [[ -f "/boot/home/config/non-packaged/etc/neofetch/config" ]]; then - default_config="/boot/home/config/non-packaged/etc/neofetch/config" - + # Note: CONFDIR here is a placeholder -- it will be replaced with your configuration directory. + if [[ -f "CONFDIR/config" ]]; then + default_config="CONFDIR/config" else [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" default_config="${script_dir%/*}/config/config" @@ -3604,12 +3586,8 @@ get_user_config() { if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then config_file="${XDG_CONFIG_HOME}/neofetch/config" - elif [[ -f "/etc/neofetch/config" ]]; then - cp "/etc/neofetch/config" "${XDG_CONFIG_HOME}/neofetch" - config_file="${XDG_CONFIG_HOME}/neofetch/config" - - elif [[ -f "/usr/local/etc/neofetch/config" ]]; then - cp "/usr/local/share/neofetch/config" "${XDG_CONFIG_HOME}/neofetch" + elif [[ -f "CONFDIR/config" ]]; then + cp "CONFDIR/config" "${XDG_CONFIG_HOME}/neofetch" config_file="${XDG_CONFIG_HOME}/neofetch/config" else