| Hash | Commit message | Author | Date | Files | + | - |
|---|
| 1 | commit 2d49747db0bada0de5dabb7563167a6229d4b68f |
| 2 | Author: Connor Etherington <[email protected]> |
| 3 | Date: Tue May 16 20:04:57 2023 +0200 |
| 4 | |
| 5 | Auto-Commit Update 16.05.2023 - 20:04:57 |
| 6 | --- |
| 7 | Makefile | 18 ++++++++++++++---- |
| 8 | 1 file changed, 14 insertions(+), 4 deletions(-) |
| 9 | |
| 10 | diff --git a/Makefile b/Makefile |
| 11 | index d54d035..95140cb 100644 |
| 12 | --- a/Makefile |
| 13 | +++ b/Makefile |
| 14 | @@ -8,14 +8,23 @@ OS = $(shell lsb_release -d | sed 's|Description:\s*||'|cut -d\ -f1) |
| 15 | |
| 16 | ifeq ($(OS),Ubuntu) |
| 17 | PACKAGE_MANAGER = apt |
| 18 | + INSTALL = sudo ${PACKAGE_MANAGER}-get install |
| 19 | + QUERY = sudo dpkg -S >/dev/null 2>&1 |
| 20 | + PKGS = python3-pip python3-setuptools libxres1 |
| 21 | endif |
| 22 | |
| 23 | ifeq ($(OS),Debian) |
| 24 | PACKAGE_MANAGER = apt |
| 25 | + INSTALL = sudo ${PACKAGE_MANAGER}-get install |
| 26 | + QUERY = sudo dpkg -S >/dev/null 2>&1 |
| 27 | + PKGS = python3-pip python3-setuptools libxres1 |
| 28 | endif |
| 29 | |
| 30 | ifeq ($(OS),Arch) |
| 31 | PACKAGE_MANAGER = pacman |
| 32 | + INSTALL = sudo ${PACKAGE_MANAGER} -Syy |
| 33 | + QUERY = sudo ${PACKAGE_MANAGER} -Qq >/dev/null 2>&1 |
| 34 | + PKGS = python-pip python-setuptools libxres |
| 35 | endif |
| 36 | |
| 37 | ifeq ($(PACKAGE_MANAGER),) |
| 38 | @@ -27,10 +36,11 @@ all: info lfpreviewer lfp cd-on-exit |
| 39 | lfpreviewer: |
| 40 | @echo -e "\n\e[1;33m[+]\e[0m Installing ${PREVIEWER}...\n" |
| 41 | @rm -rf ${PREVIEWER}/build ${PREVIEWER}/${PREVIEWER}.egg-info ${PREVIEWER}/dist |
| 42 | - @which python3 >/dev/null 2>&1 && which pip && sudo ${PACKAGE_MANAGER} -Qq libxres1 >/dev/null 2>&1 || sudo ${PACKAGE_MANAGER} -Syy python3 python-pip libxres |
| 43 | - @python3 -m pip install setuptools |
| 44 | - @cd ${PREVIEWER} && ./setup.py install && cd .. || true |
| 45 | - @type lfpreviewer >/dev/null 2>&1 || echo -e "\n\e[1;31m[-]\e[0m Please ensure you have sufficient premission to install ${PREVIEWER}." |
| 46 | + @${QUERY} ${PKGS} || ${INSTALL} ${PKGS} |
| 47 | + @python3 -m pip install --upgrade pip |
| 48 | + @python3 -m pip install --upgrade setuptools |
| 49 | + @cd ${PREVIEWER} && python3 ./setup.py install && cd .. || true |
| 50 | + @which lfpreviewer >/dev/null 2>&1 || echo -e "\n\e[1;31m[-]\e[0m Please ensure you have sufficient premission to install ${PREVIEWER}." |
| 51 | |
| 52 | lfp: |
| 53 | @echo -e "\n\e[1;33m[+]\e[0m Installing ${PKG}...\n" |