From 34547846f87d1ec0b4e23222ac65e0cd8f3f38ca Mon Sep 17 00:00:00 2001
From: JezerM <amyuki4@icloud.com>
Date: Thu, 10 Feb 2022 16:49:05 -0600
Subject: [PATCH] Python venv not needed

---
 Makefile  | 23 +++++++++--------------
 README.md |  6 +++---
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 5b0fd59..1f61724 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ ifeq (${ENABLE_BASH_COMPLETION}, true)
 endif
 
 ifeq (${ENABLE_ZSH_COMPLETION}, true)
-    ifeq ($(shell which zsh 2>/dev/null 1>&2 && echo 0), 0)
+    ifeq ($(shell which zsh >/dev/null 2>&1 && echo 0), 0)
         zshcompletiondir := /usr/share/zsh/site-functions/
     endif
 endif
@@ -37,11 +37,6 @@ endif
 
 all: build
 
-# Virtual Environment
-venv/bin/activate: requirements.txt
-	python3 -m venv venv
-	./venv/bin/pip install -r requirements.txt
-
 # Dist and web-greeter directories
 build/dist := ${BUILD_DIR}/dist
 build/web-greeter := ${BUILD_DIR}/web-greeter
@@ -66,8 +61,8 @@ $(bundle.js): $(build/web-greeter)
 
 resources.py := ${BUILD_DIR}/web-greeter/resources.py
 
-$(resources.py): venv/bin/activate $(bundle.js)
-	@./venv/bin/pyrcc5 -o ${BUILD_DIR}/web-greeter/resources.py\
+$(resources.py): $(bundle.js)
+	@pyrcc5 -o ${BUILD_DIR}/web-greeter/resources.py\
 		${BUILD_DIR}/web-greeter/resources/resources.qrc
 	@cp ${resources.py} src/
 	@echo "✔ Resources compiled with pyrcc5"
@@ -209,7 +204,7 @@ $(bin_local/web-greeter): build_install_root $(resources.py) $(bin/screensaver.s
 
 # Useful rules
 .PHONY: build
-build: venv/bin/activate $(bin_local/web-greeter)
+build: $(bin_local/web-greeter)
 	@echo "✔ Build succeded"
 
 .PHONY: install
@@ -247,11 +242,11 @@ uninstall: uninstall_preserve
 	@echo " web-greeter config was not uninstalled. Remove it manually or use \`make uninstall_all\`:\
 		\n${config/web-greeter}"
 
-run: venv/bin/activate $(resources.py)
-	./venv/bin/python3 src
+run: $(resources.py)
+	python3 src
 
-run_debug: venv/bin/activate $(resources.py)
-	./venv/bin/python3 src --debug
+run_debug: $(resources.py)
+	python3 src --debug
 
 clean:
-	rm -rf venv ${INSTALL_ROOT} ${BUILD_DIR}/dist ${BUILD_DIR}/web-greeter
+	rm -rf ${INSTALL_ROOT} ${BUILD_DIR}/dist ${BUILD_DIR}/web-greeter
diff --git a/README.md b/README.md
index 0404553..5446bcb 100644
--- a/README.md
+++ b/README.md
@@ -54,10 +54,11 @@ apt install ./web-greeter-VER.deb
 |**libxcb**                |libxcb                |libxcb1-dev              |libxcb-devel         |libxcb                |libxcb1-dev              |
 |**libx11**                |libx11                |libx11-dev               |libX11-devel         |libx11                |libx11-dev               |
 
+> Note: web-greeter does not work in Fedora. See #19
+
 ### Build dependencies
 
 - rsync
-- zip
 - make
 - pyrcc5 (Should be installed with above dependencies)
 - base-devel (build-essential)
@@ -85,8 +86,7 @@ cd web-greeter
 sudo make install
 ```
 
-This will build **web-greeter** in a virtal environment, compile some bindings with `gcc` and
-package all the files to be installed.
+This will build **web-greeter** and package all the files to be installed.
 
 See [latest release][releases].