Mirrors/xxh
2
0
Fork 0
mirror of https://github.com/xxh/xxh synced 2024-11-26 21:50:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

0.7.5

Browse source
This commit is contained in:
anki-code 2020-03-29 15:43:06 +03:00
parent 89557777af
commit ab7080839d
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -38,11 +38,11 @@ To use seamless mode run `./xxh ++extract-sourcing-files` to extract `xxh.*sh` f
| **[xonsh-appimage](https://github.com/xxh/xxh-shell-xonsh-appimage)** | stable | `xxh.xsh` | [pipeliner](https://github.com/xxh/xxh-plugin-xonsh-pipe-liner), [bar](https://github.com/xxh/xxh-plugin-xonsh-theme-bar), [autojump](https://github.com/xxh/xxh-plugin-xonsh-autojump) | [demo](https://asciinema.org/a/osSEzqnmH9pMYEZibNe2K7ZL7) |
| **[zsh](https://github.com/xxh/xxh-shell-zsh)** | stable | `xxh.zsh` | [ohmyzsh](https://github.com/xxh/xxh-plugin-zsh-ohmyzsh), [p10k](https://github.com/xxh/xxh-plugin-zsh-powerlevel10k) | [demo](https://asciinema.org/a/rCiT9hXQ5IdwqOwg6rifyFZzb) | |
| **[fish](https://github.com/xxh/xxh-shell-fish)** | prestable | | | |
| **[bash-zero](https://github.com/xxh/xxh-shell-bash-zero)** | zero | `xxh.bash` | [ohmybash](https://github.com/xxh/xxh-plugin-bash-ohmybash), [vim](https://github.com/xxh/xxh-plugin-bash-vim) | |
| **[bash-zero](https://github.com/xxh/xxh-shell-bash-zero)** | prestable | `xxh.bash` | [ohmybash](https://github.com/xxh/xxh-plugin-bash-ohmybash), [vim](https://github.com/xxh/xxh-plugin-bash-vim) | |
| **[osquery](https://github.com/xxh/xxh-shell-osquery)** | beta | | | |
| **[fish-appimage](https://github.com/xxh/xxh-shell-fish-appimage)** | alpha | | | |
The "zero" status means the shell installed on host will be used.
The "zero" means the shell installed on host will be used.
[Search xxh shell on Github](https://github.com/search?q=xxh-shell&type=Repositories) or [Bitbucket](https://bitbucket.org/repo/all?name=xxh-shell) or [create your shell entrypoint](https://github.com/xxh/xxh-shell-sample) to use another portable shell.

4
xxh_xxh/xxh.bash
View file

@ -33,6 +33,8 @@ for pluginenv_file in $local_xxh_home/.xxh/plugins/*-bash-*/env; do
fi
done
CDIR="$(cd "$(dirname "$0")" && pwd)"
CDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
[ -f $CDIR/xxh ] && xxh=$CDIR/xxh || xxh='xxh'
[ -f $CDIR/../xxh ] && xxh=$CDIR/../xxh || xxh='xxh'
$xxh "$@" +s xxh-shell-bash-zero $eargs

10
xxh_xxh/xxh.py
View file

@ -6,7 +6,7 @@ from urllib.parse import urlparse
from base64 import b64encode
from .shell import *
XXH_VERSION = '0.7.4'
XXH_VERSION = '0.7.5'
class xxh:
def __init__(self):
@ -387,8 +387,10 @@ class xxh:
installed = 0
packages = list(set(packages))
for package in packages:
subdir = self.package_subdir(package)
package_dir = self.local_xxh_home / '.xxh' / str(subdir) / package
package_name, package_source_type, package_source = self.package_parse_name(package)
subdir = self.package_subdir(package_name)
package_dir = self.local_xxh_home / '.xxh' / str(subdir) / package_name
if package_dir.exists():
if self.vverbose or not self.destination_exists:
self.eprint(f'Package exists, skip install: {package_dir}')
@ -396,8 +398,6 @@ class xxh:
self.eprint(f'Install {package} to local {package_dir}')
package_name, package_source_type, package_source = self.package_parse_name(package)
if not re.match(f'^{self.package_name_regex}$', package_name):
self.eeprint(f'Invalid package name: {package_name}\n'
+ f' Package name format: {self.package_name_regex}\n'