4 Commits
1.6.1 ... 1.6.3

Author SHA1 Message Date
fbt
27801d670f I have no ide how that piece of code got mangled
Signed-off-by: fbt <fbt@fleshless.org>
2018-08-02 12:52:56 +03:00
fbt
d706122511 kek
Signed-off-by: fbt <fbt@fleshless.org>
2018-08-01 20:20:59 +03:00
fbt
bdfa690762 remove redundant parts
Signed-off-by: fbt <fbt@fleshless.org>
2018-08-01 19:59:02 +03:00
fbt
509f11cd87 Handle symlinks gracefully
Signed-off-by: fbt <fbt@fleshless.org>
2018-08-01 19:23:59 +03:00
2 changed files with 22 additions and 8 deletions

19
sx-open
View File

@@ -108,6 +108,7 @@ handle_target() {
declare -n result=$1
declare h cmd regex target_is_file target target_left cmd_is_template
cmd_append_target=1
match=0
target=$2
target_left=$target
@@ -116,9 +117,12 @@ handle_target() {
[[ "$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_mimetype == 'inode/symlink' ]] && \
IFS=';' read target_mimetype_true _ <<< $( file -ibL "$target" )
set -- "${mime_handlers[@]}"
elif is_uri "$target"; then
set -- "${uri_handlers[@]}"
@@ -130,13 +134,22 @@ handle_target() {
cmd_str=$1 regex=$2
cmd=()
# Fix the regex
[[ $regex =~ \^?([^\$]+)\$? ]] && regex="^${BASH_REMATCH[1]}$"
if [[ $cmd_str == *'%target%'* ]]; then
cmd=( ${cmd_str//%target%/$target} )
else
cmd=( $cmd_str "$target" )
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=$?
(( result )) && return 1
@@ -170,7 +183,7 @@ scheme() {
declare r handler=$1; shift
for s in "$@"; do
uri_handlers+=( "$handler" "^$s:" )
uri_handlers+=( "$handler" "$s:.+" )
done
}

View File

@@ -1,6 +1,7 @@
#!syntax bash
# Configuration file for sx-open
# Note that as sx-open checks the regexes in order, they should be placed in order from specific to less so.
# Regexes imply '^$'
# Disable desktop notifications
#cfg notify false
@@ -15,7 +16,7 @@
# %target% — The first argument to this script.
# If not found, target is appended to the end of <cmd>
# example:
#uri 'browser %target% --profile=work' '^https://.+\.?workdomain.tld.*'
#uri 'browser %target% --profile=work' 'https://.+\.?workdomain\.tld\..*'
# scheme <cmd> <scheme>[ <scheme> ...]
#scheme browser http https
@@ -23,10 +24,10 @@
# Or you can specify a regex for the entire uri:
# uri <cmd> <regex>[ <regex> ...]
#uri steam '^steam:'
#uri browser '^(https?|ftp):'
#uri steam 'steam:.+'
#uri browser '(https?|ftp):.+'
# Mime types for filesystem targets:
# mime <cmd> <regex>[ <regex> ...]
#mime sxiv '^image/'
#mime libreoffice '^application/msword$'
#mime sxiv 'image/.+'
#mime libreoffice 'application/msword'