From e7c8b0c5800ba2bba22965dd674b99ab452a2ba9 Mon Sep 17 00:00:00 2001 From: anki-code Date: Fri, 13 Mar 2020 17:00:04 +0300 Subject: [PATCH] 0.5.4 --- xonssh_xxh/settings.py | 2 +- xxh | 2 +- xxh.zsh | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xonssh_xxh/settings.py b/xonssh_xxh/settings.py index 1cf6a1b..b0f2aa8 100644 --- a/xonssh_xxh/settings.py +++ b/xonssh_xxh/settings.py @@ -1,7 +1,7 @@ import sys, os global_settings = { - 'XXH_VERSION': '0.5.3' + 'XXH_VERSION': '0.5.4' } if __name__ == "__main__": diff --git a/xxh b/xxh index 72484c5..30cb2d8 100755 --- a/xxh +++ b/xxh @@ -612,7 +612,7 @@ class Xxh: 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" - arg_q = [] if self.vverbose else ['-q'] + arg_q = ['-q'] if self.quiet else [] if which('rsync') and host_info['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 diff --git a/xxh.zsh b/xxh.zsh index d15557e..c14c031 100755 --- a/xxh.zsh +++ b/xxh.zsh @@ -1,10 +1,8 @@ -CURR_DIR="$(cd "$(dirname "$0")" && pwd)" - d=`declare -p 2>/dev/null` if [ ! $d ]; then echo "\nThis entrypoint is to allow xxh getting current environment variables" echo "and pass some of them to xxh session.\n" echo "Usage in zsh: source xxh.sh [ordinary xxh arguments]\n" else - XXH_SH_ENV=$d $CURR_DIR/xxh +E +s xxh-shell-zsh "$@" + XXH_SH_ENV=$d xxh +E +s xxh-shell-zsh "$@" fi \ No newline at end of file