@@ -515,24 +515,22 @@ class Xxh:
515515 host_xxh_plugins_dirs_str += ' ' + str(fp'{str(local_plugin_build_dir).replace(str(self.local_xxh_home), str(host_xxh_home))}')
516516
517517 host_xxh_package_dir = host_xxh_home / 'xxh/package'
518- host_xxh_shell_build_dir = host_xxh_home / f'xxh/shells/{self.shell}/build'
518+ host_xxh_shell_dir = host_xxh_home / f'xxh/shells/{self.shell}'
519+ host_xxh_shell_build_dir = host_xxh_shell_dir / 'build'
519520 echo @(f"mkdir -p {host_xxh_package_dir} {host_xxh_shell_build_dir} {host_xxh_plugins_dirs_str}") | @(self.sshpass) ssh @(self.ssh_arg_v) @(self.ssh_arguments) @(host) -T "bash -s"
520521
521522 if which('rsync') and host_info['rsync']:
522523 self.eprint('Upload using rsync')
523524 rsync @(self.ssh_arg_v) -e @(f"{''.join(self.sshpass)} ssh {'' if self.ssh_arg_v == [] else '-v'} {' '.join(self.ssh_arguments)}") -az --info=progress2 --cvs-exclude @(self.package_dir_path)/settings.py @(host):@(host_xxh_package_dir)/ 1>&2
524525 rsync @(self.ssh_arg_v) -e @(f"{''.join(self.sshpass)} ssh {'' if self.ssh_arg_v == [] else '-v'} {' '.join(self.ssh_arguments)}") -az --info=progress2 --cvs-exclude @(shell_build_dir)/ @(host):@(host_xxh_shell_build_dir)/ 1>&2
525-
526526 for local_plugin_dir in local_plugins_dir.glob('*'):
527527 local_plugin_build_dir = local_plugin_dir/'build'
528528 local_plugin_name = local_plugin_dir.name
529529 rsync @(self.ssh_arg_v) -e @(f"{''.join(self.sshpass)} ssh {'' if self.ssh_arg_v == [] else '-v'} {' '.join(self.ssh_arguments)}") -az --info=progress2 --cvs-exclude @(local_plugin_build_dir)/* @(host):@(host_xxh_plugins_dir)/@(local_plugin_name)/build/ 1>&2
530530 elif which('scp') and host_info['scp']:
531531 self.eprint("Upload using scp. Note: install rsync on local and remote host to increase speed.")
532-
533532 @(self.sshpass) scp @(self.ssh_arg_v) @(self.ssh_arguments) -r -C @([] if self.vverbose else ['-q']) @(self.package_dir_path)/settings.py @(f"{host}:{host_xxh_package_dir}/") 1>&2
534- @(self.sshpass) scp @(self.ssh_arg_v) @(self.ssh_arguments) -r -C @([] if self.vverbose else ['-q']) @(shell_build_dir)/* @(f"{host}:{host_xxh_shell_build_dir}/") 1>&2
535-
533+ @(self.sshpass) scp @(self.ssh_arg_v) @(self.ssh_arguments) -r -C @([] if self.vverbose else ['-q']) @(shell_build_dir) @(f"{host}:{host_xxh_shell_dir}/") 1>&2
536534 for local_plugin_dir in local_plugins_dir.glob('*'):
537535 local_plugin_build_dir = local_plugin_dir/'build'
538536 local_plugin_name = local_plugin_dir.name
0 commit comments