Skip to content
Snippets Groups Projects
Commit 82b7a885 authored by Xenhat Hex's avatar Xenhat Hex Committed by Rye Mutt
Browse files

Additional fixes from Jenna Huntsman

parent ab266f02
No related branches found
No related tags found
1 merge request!53Fix Linux SLURL protocol handling
This commit is part of merge request !53. Comments created here will be created in the context of that merge request.
...@@ -17,6 +17,9 @@ if [ -z "${desired_handler}" ]; then ...@@ -17,6 +17,9 @@ if [ -z "${desired_handler}" ]; then
desired_handler="$(pwd)/etc/handle_secondlifeprotocol.sh" desired_handler="$(pwd)/etc/handle_secondlifeprotocol.sh"
fi fi
# Ensure the handle_secondlifeprotocol.sh file is executeable (otherwise, xdg-mime won't work)
chmod +x "$desired_handler"
# # Register handler for KDE-aware apps # # Register handler for KDE-aware apps
# for kdeconfig in ${LLKDECONFIG} kf5-config kde4-config kde-config; do # for kdeconfig in ${LLKDECONFIG} kf5-config kde4-config kde-config; do
# if command -v "${kdeconfig}" >/dev/null 2>&1; then # if command -v "${kdeconfig}" >/dev/null 2>&1; then
...@@ -61,7 +64,7 @@ if command -v xdg-mime query default x-scheme-handler/secondlife >/dev/null 2>&1 ...@@ -61,7 +64,7 @@ if command -v xdg-mime query default x-scheme-handler/secondlife >/dev/null 2>&1
handlerpath="${localappdir}/${newhandler}" handlerpath="${localappdir}/${newhandler}"
cat >"${handlerpath}" <<EOFnew || print "Warning: Did not register secondlife:// handler with xdg-mime: Could not write $newhandler"s cat >"${handlerpath}" <<EOFnew || print "Warning: Did not register secondlife:// handler with xdg-mime: Could not write $newhandler"s
[Desktop Entry] [Desktop Entry]
Version=1.5 Version=1.4
Name="Second Life URL handler" Name="Second Life URL handler"
Comment="secondlife:// URL handler" Comment="secondlife:// URL handler"
Type=Application Type=Application
...@@ -87,7 +90,7 @@ EOFnew ...@@ -87,7 +90,7 @@ EOFnew
print "SLURL Handler has not changed, leaving as-is." print "SLURL Handler has not changed, leaving as-is."
fi fi
fi fi
xdg-mime default ${newhandler} x-scheme-handler/secondlife xdg-mime default "${newhandler}" x-scheme-handler/secondlife
if command -v update-desktop-database >/dev/null 2>&1; then if command -v update-desktop-database >/dev/null 2>&1; then
update-desktop-database "${localappdir}" update-desktop-database "${localappdir}"
print "Registered ${desired_handler} as secondlife:// protocol handler with xdg-mime." print "Registered ${desired_handler} as secondlife:// protocol handler with xdg-mime."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment