Mirrors/xxh
2
0
Fork 0
mirror of https://github.com/xxh/xxh synced 2024-11-23 04:13:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

0.8.0

Browse source
This commit is contained in:
anki-code 2020-04-30 13:34:33 +03:00
parent 6dfca55e9a
commit 51e7716629
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
xxh_xxh/xxh.py
View file

@ -355,9 +355,15 @@ class xxh:
def create_xxh_env(self): def create_xxh_env(self):
home = p(self.local_xxh_home) home = p(self.local_xxh_home)
if not home.exists():
self.S(f"mkdir -p {home} {home / '.xxh/shells'} {home / '.xxh/plugins'}") check_dirs = [home, home / '.xxh/shells', home / '.xxh/plugins']
self.S(f"echo {XXH_VERSION} > {home / '.xxh/xxh_version'}") for d in check_dirs:
if not d.exists():
self.S(f"mkdir -p {d}")
xxh_version_file = home / '.xxh/xxh_version'
if not xxh_version_file.exists():
self.S(f"echo {XXH_VERSION} > {xxh_version_file}")
config_file = p(self.config_file) config_file = p(self.config_file)
sample_config_file = self.package_dir_path / 'config.xxhc' sample_config_file = self.package_dir_path / 'config.xxhc'
@ -577,6 +583,13 @@ class xxh:
exit(0) exit(0)
if opt.destination == 'local': if opt.destination == 'local':
tools = ['git', 'wget', 'curl']
tools_not_found = [t for t in tools if not which(t)]
if tools_not_found:
self.eprint("In the current xxh version we haven't portable versions of all tools to run xxh local. Feel free to contribute.\n"
"For now if you have access please install on the host: " + ', '.join(tools_not_found))
exit(1)
self.local = True self.local = True
if p(self.local_xxh_home).absolute() == p(self.host_xxh_home).absolute(): if p(self.local_xxh_home).absolute() == p(self.host_xxh_home).absolute():
opt.local_xxh_home = str(p(opt.local_xxh_home) / '.xxh_local') opt.local_xxh_home = str(p(opt.local_xxh_home) / '.xxh_local')
@ -785,9 +798,7 @@ class xxh:
# Check version # Check version
ask = False ask = False
if host_xxh_version == 'version_not_found': if host_xxh_version not in ['dir_not_found', 'dir_empty', 'version_not_found'] and host_xxh_version != self.local_xxh_version:
ask = f'Host xxh home is not empty but something went wrong while getting host xxh version.'
elif host_xxh_version not in ['dir_not_found', 'dir_empty'] and host_xxh_version != self.local_xxh_version:
ask = f"Local xxh version '{self.local_xxh_version}' is not equal host xxh version '{host_xxh_version}'." ask = f"Local xxh version '{self.local_xxh_version}' is not equal host xxh version '{host_xxh_version}'."
if ask: if ask:
@ -956,7 +967,7 @@ class xxh:
host_xxh_shell_dir=host_xxh_shell_dir host_xxh_shell_dir=host_xxh_shell_dir
)) ))
for local_plugin_dir in list(local_plugins_dir.glob(f'xxh-plugin-{self.short_shell_name}-*')) + list(local_plugins_dir.glob(f'xxh-plugin-{self.short_shell_name}-*')): for local_plugin_dir in list(local_plugins_dir.glob(f'xxh-plugin-prerun-*')) + list(local_plugins_dir.glob(f'xxh-plugin-{self.short_shell_name}-*')):
local_plugin_build_dir = local_plugin_dir/'build' local_plugin_build_dir = local_plugin_dir/'build'
local_plugin_name = local_plugin_dir.name local_plugin_name = local_plugin_dir.name
self.S('{bb}{scp} {local_plugin_build_dir}/* {host}:{host_xxh_plugins_dir}/{local_plugin_name}/build/ 1>&2{be}'.format( self.S('{bb}{scp} {local_plugin_build_dir}/* {host}:{host_xxh_plugins_dir}/{local_plugin_name}/build/ 1>&2{be}'.format(
@ -978,7 +989,7 @@ class xxh:
host_xxh_shell_dir=host_xxh_shell_dir host_xxh_shell_dir=host_xxh_shell_dir
)) ))
for local_plugin_dir in list(local_plugins_dir.glob(f'xxh-plugin-{self.short_shell_name}-*')) + list(local_plugins_dir.glob(f'xxh-plugin-{self.short_shell_name}-*')): for local_plugin_dir in list(local_plugins_dir.glob(f'xxh-plugin-prerun-*')) + list(local_plugins_dir.glob(f'xxh-plugin-{self.short_shell_name}-*')):
local_plugin_build_dir = local_plugin_dir/'build' local_plugin_build_dir = local_plugin_dir/'build'
local_plugin_name = local_plugin_dir.name local_plugin_name = local_plugin_dir.name
self.S('{bb}cp -r {local_plugin_build_dir}/* {host_xxh_plugins_dir}/{local_plugin_name}/build/ 1>&2{be}'.format( self.S('{bb}cp -r {local_plugin_build_dir}/* {host_xxh_plugins_dir}/{local_plugin_name}/build/ 1>&2{be}'.format(