Skip to content

Fix find_desktop_file and minor bug fixes. #11

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

Open
jastintime wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix find_desktop_file and minor bug fixes. #11

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
18 changes: 9 additions & 9 deletions xdg-open
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ find_exec_in_desktop_file() {

find_desktop_file_by() {
local path=("$HOME/.local/share/applications")
[[ -z "$HOME/.local/share/applications" ]] && path=(/usr/share/applications/) || path+=(/usr/share/applications/)
[[ ! -d "$HOME/.local/share/applications" ]] && path=(/usr/share/applications/) || path+=(/usr/share/applications/)
grep -m 1 "^$1=.*$2" -R "${path[@]}" | awk -F : -v pat="$2" '{ print index($2, pat), length($2), $1 }' | sort -t ' ' -k1,1n -k2,2nr | awk '{ print $3; exit }'
}

Expand Down Expand Up @@ -76,13 +76,13 @@ general_mime=''

# fix file:// with support for file://.html#section
if [[ "$arg" =~ ^file://([^#]*\.html)#.*$ ]]; then
protocol=file
protocol="file"
mime=text/html
ext=html
elif [[ "$arg" =~ ^file://(.*)$ ]]; then
# strip file://
arg="$(url_decode <<<"${BASH_REMATCH[1]}")"
protocol=file
protocol="file"
fi

if [[ -e "$arg" ]]; then
Expand Down Expand Up @@ -142,9 +142,9 @@ for search in $ext $protocol $mime $general_mime; do
# handle environmental variables
i=0
for w in "${app[@]}"; do
if [[ -n "$(echo "$w" | grep '^\$')" ]]; then
program="$(echo "$w" | sed 's/^\$//')"
app[$i]="$(env | grep "^$program=" | head -1 | cut -d = -f 2)"
if echo "$w" | grep -q '^\$';then
program="${w#\$}"
app[i]="$(env | grep "^$program=" | head -1 | cut -d = -f 2)"
fi
i=$((i+1));
done
Expand All @@ -156,7 +156,7 @@ for search in $mime $general_mime; do
desktop="$(find_desktop_file_by MimeType "$search")"
if [[ "$desktop" ]]; then
echo "$desktop"
app=($(find_exec_in_desktop_file <"$desktop"))
app=($(find_exec_in_desktop_file "$@" <"$desktop"))
if need_terminal <"$desktop"; then
echo "term: $TERM"
exists "$TERM" && fork_run "$TERM" -e "${app[@]}" "$arg"
Expand All @@ -167,8 +167,8 @@ for search in $mime $general_mime; do
done

# ask
if exists $MENU; then
app=($(compgen -c | sort -u | $MENU -p "how to open $(basename $arg)" $MENUARGS))
if exists "$MENU"; then
app=($(compgen -c | sort -u | $MENU -p "how to open $(basename "$arg")" "$MENUARGS"))
[[ "${app[*]}" ]] && fork_run "${app[@]}" "$arg"
elif exists notify-send; then
notify-send "Could not find opener, exiting..."
Expand Down