Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move configuration files to /etc/xpra
The default-settings.txt file is a configuration file editable by user, so its place on Unix systems is in /etc. With this commit, configuration file with names defined in 'configuration_files' dict are not minified or compressed. They are moved to '/etc/xpra' directory if DEB or RPM package is built. Also fix typo in 'make_rpm'. Test: 1. Spawn container with Debian: podman run --rm -it -v $PWD:/work:rw \ docker.io/amd64/debian:sid /bin/bash 2. Inside container: export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get full-upgrade -yq && \ apt-get install -yq git python3-setuptools && \ cp -a /work /build && find /build -type d -exec chmod 0755 '{}' \; && \ cd /build && \ git checkout '*' && \ git clean -fdx && \ rm -rf /tmp/xpra-html5 && \ rm -rf /etc/xpra /usr/share/xpra/www && \ rm -rf /root/rpmbuild && \ python3 setup.py sdist && \ python3 setup.py install /tmp/xpra-html5 && \ python3 setup.py install && \ python3 setup.py deb && \ echo "Contents of dist tars:" && \ tar tvf dist/*.tar.gz && \ echo "Contents of /tmp/xpra-html5:" && \ ls -la /tmp/xpra-html5 && \ echo "Contents of /etc/xpra/html5-client /usr/share/xpra/www:" && \ ls -la /etc/xpra/html5-client /usr/share/xpra/www && \ echo "Contents of Debian packages:" && \ find dist/ -name "*.deb" -exec dpkg -c '{}' \; && \ echo "OK" || echo "FAIL" Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
- Loading branch information