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

Merge pull request #124 from Moulick/Moulick-patch-1

Browse source 
Handle difference in base64 on MacOS
This commit is contained in:
Andy Kipp 2021-12-19 22:28:34 +03:00 committed by GitHub
commit 67e93421be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
xxh/xxh_xxh/xxh.zsh
View file

@ -9,23 +9,33 @@ local_xxh_home=~/.xxh
eargs=""
setopt +o nomatch
for pluginenv_file in $local_xxh_home/.xxh/plugins/*-zsh-*/env; do
for pluginenv_file in "$local_xxh_home"/.xxh/plugins/*-zsh-*/env; do
if [[ -f $pluginenv_file ]]; then
plugin_name=$(basename `dirname $pluginenv_file` | tr a-z A-Z | sed 's/-/_/g')
plugin_name=$(basename "$(dirname "$pluginenv_file")" | tr "[:lower:]" "[:upper:]" | sed 's/-/_/g')
if [[ $XXH_VERBOSE == '1' || $XXH_VERBOSE == '2' ]]; then
echo Load plugin env $pluginenv_file
echo Load plugin env "$pluginenv_file"
fi
for l in `cat $pluginenv_file`
for l in $(cat "$pluginenv_file")
do
if [[ -v $l ]]; then
d=`declare -p $l | base64 --wrap=0`
dd="export $plugin_name"_EXE_"$l=$d"
ddd=`echo $dd | base64 --wrap=0`
case $(uname -s) in
Darwin)
# bas64 in macos uses -b (break) instead of --wrap, and it's 0 by default
d=$(declare -p "$l" | base64)
dd="export $plugin_name"_EXE_"$l=$d"
ddd=$(echo "$dd" | base64)
;;
*)
d=$(declare -p "$l" | base64 --wrap=0)
dd="export $plugin_name"_EXE_"$l=$d"
ddd=$(echo "$dd" | base64 --wrap=0)
;;
esac
if [[ $XXH_VERBOSE == '2' ]]; then
echo Prepare plugin env $pluginenv_file: name=$l, declare=$d
echo Prepare plugin env $pluginenv_file bash: $dd
echo Prepare plugin env "$pluginenv_file": name="$l", declare="$d"
echo Prepare plugin env "$pluginenv_file" bash: "$dd"
fi
eargs="$eargs +heb $ddd"
fi
@ -35,5 +45,6 @@ done
setopt -o nomatch
CDIR="$(cd "$(dirname "$0")" && pwd)"
[ -f $CDIR/xxh ] && xxh=$CDIR/xxh || xxh='xxh'
$xxh +s xxh-shell-zsh ${(z)eargs} "$@"
[ -f "$CDIR"/xxh ] && xxh="$CDIR"/xxh || xxh='xxh'
# shellcheck disable=SC2296
$xxh +s xxh-shell-zsh "${(z)eargs}" "$@"