Browse Source

Fix echo new lines in bin/web-greeter

sisyphus
JezerM 3 years ago
parent
commit
eeebb6b36b
No known key found for this signature in database
GPG Key ID: 66BBC5D01388C6B5
  1. 13
      .editorconfig
  2. 6
      Makefile

13
.editorconfig

@ -8,17 +8,8 @@ curly_bracket_next_line = false
end_of_line = lf end_of_line = lf
indent_brace_style = 1TBS indent_brace_style = 1TBS
indent_size = 4 indent_size = 4
indent_style = tab indent_style = space
insert_final_newline = true insert_final_newline = true
max_line_length = 99 max_line_length = 100
tab_width = 4 tab_width = 4
trim_trailing_whitespace = true trim_trailing_whitespace = true
[*.js]
indent_style = space
[*.py]
indent_style = space
[*.yml]
indent_style = space

6
Makefile

@ -202,7 +202,7 @@ $(bin/screensaver.so): $(build/web-greeter)
$(bin_local/web-greeter): build_install_root $(resources.py) $(bin/screensaver.so) $(bin_local/web-greeter): build_install_root $(resources.py) $(bin/screensaver.so)
@rm -rf "${INSTALL_PREFIX}/lib/web-greeter/*" @rm -rf "${INSTALL_PREFIX}/lib/web-greeter/*"
@cp -R "${BUILD_DIR}/web-greeter"/* "${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}" "${bin_local/web-greeter}"
@chmod +x "${bin_local/web-greeter}" @chmod +x "${bin_local/web-greeter}"
@echo "✔ web-greeter binary copied" @echo "✔ web-greeter binary copied"
@ -248,10 +248,10 @@ uninstall: uninstall_preserve
\n${config/web-greeter}" \n${config/web-greeter}"
run: venv/bin/activate $(resources.py) run: venv/bin/activate $(resources.py)
python3 src ./venv/bin/python3 src
run_debug: venv/bin/activate $(resources.py) run_debug: venv/bin/activate $(resources.py)
python3 src --debug ./venv/bin/python3 src --debug
clean: clean:
rm -rf venv ${INSTALL_ROOT} ${BUILD_DIR}/dist ${BUILD_DIR}/web-greeter rm -rf venv ${INSTALL_ROOT} ${BUILD_DIR}/dist ${BUILD_DIR}/web-greeter

Loading…
Cancel
Save