From 410af8fcbf32fc3f09203f76bd1ccc40475b3e8e Mon Sep 17 00:00:00 2001 From: cyteen Date: Tue, 30 Jul 2024 11:18:49 +0100 Subject: [PATCH] Remove more ambiguous unicode characters. --- 020_distcc_master.sh | 10 +++---- 020_distcc_slave.sh | 14 ++++----- 020_python-prospector.sh | 8 +++--- 020_sbuild.sh | 62 ++++++++++++++++++++-------------------- zsh_async-example.sh | 4 +-- 5 files changed, 47 insertions(+), 51 deletions(-) diff --git a/020_distcc_master.sh b/020_distcc_master.sh index 764e86e..3c42ca8 100644 --- a/020_distcc_master.sh +++ b/020_distcc_master.sh @@ -5,16 +5,16 @@ apt-get install -y distcc distcc-pump ccache dmucs distccmon-gnome apt-get install avahi-daemon avahi-utils libnss-mdns apt-get install avahi-ui-utils avahi-discover -# Update the symlinks found in +# Update the symlinks found in /usr/sbin/update-ccache-symlinks -## distcc will use Avahi Zeroconf DNS Service Discovery (DNS-SD) to locate any available distccd servers on the local network. +## distcc will use Avahi Zeroconf DNS Service Discovery (DNS-SD) to locate any available distccd servers on the local network. # # The distccd server must be started with --zeroconf or /etc/default/distcc STARTDISTCC set to true. # # NB An important caveat is that in the current implementation, pump mode (",cpp") and compression (",lzo") will never be used for hosts located via zeroconf. Enabling compression makes the distcc client and server use more CPU time, but less network traffic. The added CPU time is insignificant for pump mode. Compression is usually economical on networks slower than 100Mbps -cat > /etc/distcc/hosts </etc/distcc/hosts </share/dmucs/hosts-info). +# Create a hosts-info file in the location '/usr/local/share/dmucs/hosts-info' (or, if you specified –-prefix when 'configure'ing, in /share/dmucs/hosts-info). #Here is a sample hosts-info file: # Format: machine number-of-cpus power-index @@ -88,7 +88,7 @@ sed -i "s,^\(USE_SERVER=\).*,\1\"${USE_SERVER}\"," /etc/default/dmucs #old-solaris-comp-3 1 2 #169.144.80.25 1 2 -cat > /etc/dmuc.conf </etc/dmuc.conf < /etc/distcc/hosts </etc/distcc/hosts </share/dmucs/hosts-info). +# Create a hosts-info file in the location '/usr/local/share/dmucs/hosts-info' (or, if you specified –-prefix when 'configure'ing, in /share/dmucs/hosts-info). #Here is a sample hosts-info file: # Format: machine number-of-cpus power-index @@ -89,13 +89,9 @@ sed -i "s,^\(USE_SERVER=\).*,\1\"${USE_SERVER}\"," /etc/default/dmucs #old-solaris-comp-3 1 2 #169.144.80.25 1 2 -cat > /etc/dmuc.conf </etc/dmuc.conf </dev/null pycodestyle pycodestyle is a simple tool to warn about violations of the PEP8 style guide. It produces messages for any divergence from the style guide. - Prospector’s concept of strictness turns off various warnings depending on the strictness level. By default, several PEP8 errors will be suppressed. To adjust this without adjusting the strictness of other tools, you have some options: + Prospector's concept of strictness turns off various warnings depending on the strictness level. By default, several PEP8 errors will be suppressed. To adjust this without adjusting the strictness of other tools, you have some options: # turn off pep8 checking completely: prospector --no-style-warnings @@ -58,12 +58,12 @@ cat <<-EOF | sudo tee doc-pak/README >/dev/null McCabe or cyclomatic complexity is a measurement of how many paths there are in a given function or method. It measures how complicated your functions are, and warns if they reach a certain threshold. Methods that are too complex are prone to logic errors, and should be refactored to a series of smaller methods. Dodgy - Dodgy is a very simple tool designed to find ‘dodgy’ things which should not be in a public project, such as secret keys, passwords, AWS tokens or source control diffs. + Dodgy is a very simple tool designed to find 'dodgy' things which should not be in a public project, such as secret keys, passwords, AWS tokens or source control diffs. Pydocstyle Pydocstyle is a simple tool to warn about violations of the PEP257 Docstring Conventions. It produces messages for any divergence from the style guide. - This tool is currently considered experimental due to some bugs in its ability to parse code. For example, modules that contain an __all__ could end up producing bogus error messages if the __all__ isn’t formatted exactly as pydocstyle expects it. + This tool is currently considered experimental due to some bugs in its ability to parse code. For example, modules that contain an __all__ could end up producing bogus error messages if the __all__ isn't formatted exactly as pydocstyle expects it. It will not run by default, and must be enabled explicitly (via --with-tool pep257 or in a profile) or implicitly (using the --doc-warnings flag). diff --git a/020_sbuild.sh b/020_sbuild.sh index 91bba47..c380913 100644 --- a/020_sbuild.sh +++ b/020_sbuild.sh @@ -31,11 +31,11 @@ sources_dir="$R/tmp/kernels/rockpro64" # where the sources outside the chroot ar sources_dest="/scratch" # where to mount the sources you wish to build in the chroot. conf_print_schroot() { - fn conf_print_schroot - req=(OLD_STABLE STABLE TESTING UNSTABLE) - ckreq || return 1 + fn conf_print_schroot + req=(OLD_STABLE STABLE TESTING UNSTABLE) + ckreq || return 1 - cat <<-EOF + cat <<-EOF # schroot chroot definitions. # See schroot.conf(5) for complete documentation of the file format. # @@ -67,11 +67,11 @@ conf_print_schroot() { # See: https://wiki.ubuntu.com/SimpleSbuild # cp /usr/share/doc/sbuild/examples/example.sbuildrc ~/.sbuildrc conf_print_sbuildrc() { - fn conf_print_sbuildrc - req=(release) - ckreq || return 1 + fn conf_print_sbuildrc + req=(release) + ckreq || return 1 - cat <<-EOF | sudo tee ~/.sbuildrc + cat <<-EOF | sudo tee ~/.sbuildrc # sbuild configuration file # # See sbuild.conf(5) for complete documentation of the file format. @@ -108,11 +108,11 @@ conf_print_sbuildrc() { # Create ~/.mk-sbuild.rc: conf_print_mk_sbuild_rc() { - fn conf_print_mk_sbuild_rc - req=(apt_proxy) - ckreq || return 1 + fn conf_print_mk_sbuild_rc + req=(apt_proxy) + ckreq || return 1 - cat <<-EOF + cat <<-EOF SCHROOT_CONF_SUFFIX="source-root-users=root,sbuild,admin source-root-groups=root,sbuild,admin preserve-environment=true" @@ -132,11 +132,11 @@ conf_print_mk_sbuild_rc() { mkdir -p /etc/schroot/${schroot_config} conf_print_chroot_config() { - fn conf_print_chroot_config - req=(schoot_config sources_dir sources_dest) - ckreq || return 1 + fn conf_print_chroot_config + req=(schoot_config sources_dir sources_dest) + ckreq || return 1 - cat <<-EOF | sudo tee /etc/schroot/${schroot_config}/copyfiles + cat <<-EOF | sudo tee /etc/schroot/${schroot_config}/copyfiles # Files to copy into the chroot from the host system. # # [ ] @@ -146,7 +146,7 @@ conf_print_chroot_config() { ~/.Xauthority EOF - cat <<-EOF | sudo tee /etc/schroot/${schroot_config}/fstab + cat <<-EOF | sudo tee /etc/schroot/${schroot_config}/fstab # fstab: static file system information for chroots. # Note that the mount point will be prefixed by the chroot path # (CHROOT_PATH) @@ -169,7 +169,7 @@ conf_print_chroot_config() { #/run/shm /run/shm none rw,bind 0 0 EOF - cat <<-EOF | sudo tee /etc/schroot/${schroot_config}/nssdatabases + cat <<-EOF | sudo tee /etc/schroot/${schroot_config}/nssdatabases # System databases to copy into the chroot from the host system. # # @@ -183,7 +183,7 @@ conf_print_chroot_config() { hosts EOF - cat <<-EOF | sudo tee /etc/schroot/${schroot_config}/config + cat <<-EOF | sudo tee /etc/schroot/${schroot_config}/config # Filesystems to mount inside the chroot. FSTAB="/etc/schroot/custom/fstab" @@ -223,16 +223,16 @@ conf_print_chroot_config() { # EOF conf_print_chroot_d() { - fn conf_print_chroot_d - req=(strapdir arch release schroot_config) - ckreq || return 1 + fn conf_print_chroot_d + req=(strapdir arch release schroot_config) + ckreq || return 1 - cat <<-EOF | sudo tee -a /etc/schroot/schroot.d/${release}_${arch} + cat <<-EOF | sudo tee -a /etc/schroot/schroot.d/${release}_${arch} [${release}_${arch}] description=${release} (${arch}) for devuan arm-sdk type=directory directory=${strapdir} - union-type=overlay # ‘aufs’, ‘overlay’ and ‘unionfs’ + union-type=overlay # 'aufs', 'overlay' and 'unionfs' command-prefix=eatmydata,ccache users=default source-users=default @@ -248,13 +248,13 @@ sudo zfs snapshot ${zfs_snapshot}@initial sudo zfs create ${zfs_snapshot} sudo sbuild-createchroot \ - --arch=${arch} \ - --include=debhelper,eatmydata,ccache \ - --chroot-mode=schroot \ - --components=main contrib non-free \ - ${release} \ - ${zfs_snapshot} \ - ${mirror} + --arch=${arch} \ + --include=debhelper,eatmydata,ccache \ + --chroot-mode=schroot \ + --components=main contrib non-free \ + ${release} \ + ${zfs_snapshot} \ + ${mirror} # cat <<-EOF | sudo tee /etc/schroot/chroot.d/sid-zfs-snapshot # [sid-zfs-snapshot] diff --git a/zsh_async-example.sh b/zsh_async-example.sh index e58bc06..118c90b 100644 --- a/zsh_async-example.sh +++ b/zsh_async-example.sh @@ -1,6 +1,6 @@ -# Install zsh-async if it’s not present +# Install zsh-async if it's not present if [[ ! -a ~/.zsh-async ]]; then - git clone -b ‘v1.5.2’ git@github.com:mafredri/zsh-async ~/.zsh-async + git clone -b 'v1.5.2' git@github.com:mafredri/zsh-async ~/.zsh-async fi source ~/.zsh-async/async.zsh