8000 Handle difference in base64 on MacOS by Moulick · Pull Request #124 · xxh/xxh · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Handle difference in base64 on MacOS #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2021
Merged

Handle difference in base64 on MacOS #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions xxh/xxh_xxh/xxh.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}" "$@"
0