This commit is contained in:
anki-code 2020-03-13 17:00:04 +03:00
parent dc8e9f5f48
commit e7c8b0c580
3 changed files with 3 additions and 5 deletions

View file

@ -1,7 +1,7 @@
import sys, os import sys, os
global_settings = { global_settings = {
'XXH_VERSION': '0.5.3' 'XXH_VERSION': '0.5.4'
} }
if __name__ == "__main__": if __name__ == "__main__":

2
xxh
View file

@ -612,7 +612,7 @@ class Xxh:
host_xxh_shell_build_dir = host_xxh_shell_dir / 'build' host_xxh_shell_build_dir = host_xxh_shell_dir / 'build'
echo @(f"mkdir -p {host_xxh_package_dir} {host_xxh_shell_build_dir} {host_xxh_dirs_str}") | @(self.sshpass) ssh @(self.ssh_arg_v) @(self.ssh_arguments) @(host) -T "bash -s" echo @(f"mkdir -p {host_xxh_package_dir} {host_xxh_shell_build_dir} {host_xxh_dirs_str}") | @(self.sshpass) ssh @(self.ssh_arg_v) @(self.ssh_arguments) @(host) -T "bash -s"
arg_q = [] if self.vverbose else ['-q'] arg_q = ['-q'] if self.quiet else []
if which('rsync') and host_info['rsync']: if which('rsync') and host_info['rsync']:
self.eprint('Upload using rsync') self.eprint('Upload using rsync')
rsync @(self.ssh_arg_v) -e @(f"{''.join(self.sshpass)} ssh {'' if self.ssh_arg_v == [] else '-v'} {' '.join(self.ssh_arguments)}") @(arg_q) -az --info=progress2 --cvs-exclude @(self.package_dir_path)/settings.py @(host):@(host_xxh_package_dir)/ 1>&2 rsync @(self.ssh_arg_v) -e @(f"{''.join(self.sshpass)} ssh {'' if self.ssh_arg_v == [] else '-v'} {' '.join(self.ssh_arguments)}") @(arg_q) -az --info=progress2 --cvs-exclude @(self.package_dir_path)/settings.py @(host):@(host_xxh_package_dir)/ 1>&2

View file

@ -1,10 +1,8 @@
CURR_DIR="$(cd "$(dirname "$0")" && pwd)"
d=`declare -p 2>/dev/null` d=`declare -p 2>/dev/null`
if [ ! $d ]; then if [ ! $d ]; then
echo "\nThis entrypoint is to allow xxh getting current environment variables" echo "\nThis entrypoint is to allow xxh getting current environment variables"
echo "and pass some of them to xxh session.\n" echo "and pass some of them to xxh session.\n"
echo "Usage in zsh: source xxh.sh [ordinary xxh arguments]\n" echo "Usage in zsh: source xxh.sh [ordinary xxh arguments]\n"
else else
XXH_SH_ENV=$d $CURR_DIR/xxh +E +s xxh-shell-zsh "$@" XXH_SH_ENV=$d xxh +E +s xxh-shell-zsh "$@"
fi fi