Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Misc: Removed Makefile and added install script #754

Merged
merged 7 commits into from
Jul 1, 2017
Merged

Misc: Removed Makefile and added install script #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
96103a7
Misc: Removed Makefile and added install script
Jun 20, 2017
8665cbb
Misc: Different behaviors if PREFIX is empty
Jun 20, 2017
29ae56d
Misc: Delete the leading slash
Jun 20, 2017
062dbcd
Installscript: Use POSIX-compliant sh instead of bash
Jun 24, 2017
ca78d52
Misc: Remove comments
Jun 27, 2017
24131bf
Merge branch 'master' into install-sh
Jul 1, 2017
a31a445
Installscript: Update with latest config filename
Jul 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions Makefile
View file
Open in desktop

This file was deleted.

37 changes: 37 additions & 0 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/sh

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

if [ -z "$PREFIX" ]; then
[ -z "$BINDIR" ] && BINDIR="/usr/bin"
[ -z "$ASCIIDIR" ] && ASCIIDIR="/usr/share/neofetch/ascii/distro"
[ -z "$MANDIR" ] && MANDIR="/usr/share/man/man1"
else
[ -z "$BINDIR" ] && BINDIR="/bin"
[ -z "$ASCIIDIR" ] && ASCIIDIR="/share/neofetch/ascii/distro"
[ -z "$MANDIR" ] && MANDIR="/share/man/man1"
fi
[ -z "$CONFDIR" ] && CONFDIR="/etc/neofetch"

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.conf "${DESTDIR}""${PREFIX}""${CONFDIR}"
cp -p ascii/distro/* "${DESTDIR}""${PREFIX}""${ASCIIDIR}"
cp -p neofetch.1 "${DESTDIR}""${PREFIX}""${MANDIR}"
35 changes: 6 additions & 29 deletions neofetch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2203,18 +2203,8 @@ 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"

if [[ -d "ASCIIDIR" ]]; then
ascii_dir="ASCIIDIR"
else
[[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")"
ascii_dir="${script_dir%/*}/ascii/distro"
Expand Down Expand Up @@ -3602,17 +3592,8 @@ get_full_path() {
}

get_default_config() {
if [[ -f "/etc/neofetch/config.conf" ]]; then
default_config="/etc/neofetch/config.conf"

elif [[ -f "/usr/local/etc/neofetch/config.conf" ]]; then
default_config="/usr/local/etc/neofetch/config.conf"

elif [[ -f "/data/data/com.termux/files/usr/etc/neofetch/config.conf" ]]; then
default_config="/data/data/com.termux/files/usr/etc/neofetch/config.conf"

elif [[ -f "/boot/home/config/non-packaged/etc/neofetch/config.conf" ]]; then
default_config="/boot/home/config/non-packaged/etc/neofetch/config.conf"
if [[ -f "CONFDIR/config.conf" ]]; then
default_config="CONFDIR/config.conf"

else
[[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")"
Expand Down Expand Up @@ -3644,12 +3625,8 @@ get_user_config() {
elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then
config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"

elif [[ -f "/etc/neofetch/config.conf" ]]; then
cp "/etc/neofetch/config.conf" "${XDG_CONFIG_HOME}/neofetch"
config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"

elif [[ -f "/usr/local/etc/neofetch/config.conf" ]]; then
cp "/usr/local/share/neofetch/config.conf" "${XDG_CONFIG_HOME}/neofetch"
elif [[ -f "CONFDIR/config.conf" ]]; then
cp "CONFDIR/config.conf" "${XDG_CONFIG_HOME}/neofetch"
config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"

else
Expand Down