Handle symlinks gracefully

Signed-off-by: fbt <fbt@fleshless.org>
This commit is contained in:
Jack L. Frost 2018-08-01 19:23:59 +03:00
parent ada3aafd2c
commit 509f11cd87

18
sx-open
View File

@ -108,6 +108,7 @@ handle_target() {
declare -n result=$1 declare -n result=$1
declare h cmd regex target_is_file target target_left cmd_is_template declare h cmd regex target_is_file target target_left cmd_is_template
cmd_append_target=1 cmd_append_target=1
match=0
target=$2 target=$2
target_left=$target target_left=$target
@ -116,9 +117,11 @@ handle_target() {
[[ "$target" =~ ^/.* ]] || { target="${PWD}/${target}"; } # Turn relative paths to absolute ones. [[ "$target" =~ ^/.* ]] || { target="${PWD}/${target}"; } # Turn relative paths to absolute ones.
IFS=';' read target_mimetype charset <<< $( file -ibL "$target" ) IFS=';' read target_mimetype _ <<< $( file -ib "$target" )
target_left=$target_mimetype target_left=$target_mimetype
IFS=';' read target_mimetype_true _ <<< $( file -ib "$target" )
set -- "${mime_handlers[@]}" set -- "${mime_handlers[@]}"
elif is_uri "$target"; then elif is_uri "$target"; then
set -- "${uri_handlers[@]}" set -- "${uri_handlers[@]}"
@ -130,13 +133,22 @@ handle_target() {
cmd_str=$1 regex=$2 cmd_str=$1 regex=$2
cmd=() cmd=()
# Fix the regex
[[ $regex =~ \^?([^\$]+)\$? ]] && regex="^${BASH_REMATCH[1]}$"
if [[ $cmd_str == *'%target%'* ]]; then if [[ $cmd_str == *'%target%'* ]]; then
cmd=( ${cmd_str//%target%/$target} ) cmd=( ${cmd_str//%target%/$target} )
else else
cmd=( $cmd_str "$target" ) cmd=( $cmd_str "$target" )
fi fi
if [[ "$target_left" =~ $regex ]]; then if [[ $target_left =~ $regex ]]; then
match=1
elif [[ $target_mimetype_true ]]; then
[[ $target_mimetype_true =~ $regex ]] && match=1
fi
if (( match )); then
act "${cmd[@]}"; result=$? act "${cmd[@]}"; result=$?
(( result )) && return 1 (( result )) && return 1
@ -170,7 +182,7 @@ scheme() {
declare r handler=$1; shift declare r handler=$1; shift
for s in "$@"; do for s in "$@"; do
uri_handlers+=( "$handler" "^$s:" ) uri_handlers+=( "$handler" "$s:.+" )
done done
} }