From eeebb6b36b29fc7fca70b88087a2c4beb12c717e Mon Sep 17 00:00:00 2001
From: JezerM <amyuki4@icloud.com>
Date: Mon, 7 Feb 2022 21:58:34 -0600
Subject: [PATCH] Fix echo new lines in bin/web-greeter

---
 .editorconfig | 13 ++-----------
 Makefile      |  6 +++---
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 619e2bd..46a83d8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,17 +8,8 @@ curly_bracket_next_line  = false
 end_of_line              = lf
 indent_brace_style       = 1TBS
 indent_size              = 4
-indent_style             = tab
+indent_style             = space
 insert_final_newline     = true
-max_line_length          = 99
+max_line_length          = 100
 tab_width                = 4
 trim_trailing_whitespace = true
-
-[*.js]
-indent_style = space
-
-[*.py]
-indent_style = space
-
-[*.yml]
-indent_style = space
diff --git a/Makefile b/Makefile
index fc5bfd1..5b0fd59 100644
--- a/Makefile
+++ b/Makefile
@@ -202,7 +202,7 @@ $(bin/screensaver.so): $(build/web-greeter)
 $(bin_local/web-greeter): build_install_root $(resources.py) $(bin/screensaver.so)
 	@rm -rf "${INSTALL_PREFIX}/lib/web-greeter/*"
 	@cp -R "${BUILD_DIR}/web-greeter"/* "${INSTALL_PREFIX}/lib/web-greeter"
-	@echo "#!/usr/bin/env bash\npython3 ${DESTDIR_PREFIX}/lib/web-greeter \$$@" > \
+	@printf "#!/usr/bin/env bash\npython3 ${DESTDIR_PREFIX}/lib/web-greeter \$$@" > \
 		"${bin_local/web-greeter}"
 	@chmod +x "${bin_local/web-greeter}"
 	@echo "✔ web-greeter binary copied"
@@ -248,10 +248,10 @@ uninstall: uninstall_preserve
 		\n${config/web-greeter}"
 
 run: venv/bin/activate $(resources.py)
-	python3 src
+	./venv/bin/python3 src
 
 run_debug: venv/bin/activate $(resources.py)
-	python3 src --debug
+	./venv/bin/python3 src --debug
 
 clean:
 	rm -rf venv ${INSTALL_ROOT} ${BUILD_DIR}/dist ${BUILD_DIR}/web-greeter