diff options
| author | David Walter Seikel | 2013-05-12 02:43:29 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-05-12 02:43:29 +1000 |
| commit | 979e9f8ad7732e4f084f02b62d4508b2eb6f28a3 (patch) | |
| tree | 63db479403a5e2bc103d2e47469250effddc3a0e /linden | |
| parent | Fix Inventory "Cut" and "Paste" deletes inventory item instead of moving it, ... (diff) | |
| download | meta-impy-979e9f8ad7732e4f084f02b62d4508b2eb6f28a3.zip meta-impy-979e9f8ad7732e4f084f02b62d4508b2eb6f28a3.tar.gz meta-impy-979e9f8ad7732e4f084f02b62d4508b2eb6f28a3.tar.bz2 meta-impy-979e9f8ad7732e4f084f02b62d4508b2eb6f28a3.tar.xz | |
Fix - Did not register secondlife:// handler with KDE - http://redmine.kokuaviewer.org/issues/1068
Diffstat (limited to 'linden')
| -rwxr-xr-x | linden/indra/newview/linux_tools/register_secondlifeprotocol.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh index 338fc26..3f2378a 100755 --- a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh +++ b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh | |||
| @@ -22,13 +22,12 @@ else | |||
| 22 | fi | 22 | fi |
| 23 | 23 | ||
| 24 | # Register handler for KDE-aware apps | 24 | # Register handler for KDE-aware apps |
| 25 | if [ -z "$KDEHOME" ]; then | 25 | for LLKDECONFIG in kde-config kde4-config; do |
| 26 | KDEHOME=~/.kde | 26 | if [ `which $LLKDECONFIG` ]; then |
| 27 | fi | 27 | LLKDEPROTODIR=`$LLKDECONFIG --path services | cut -d ':' -f 1` |
| 28 | LLKDEPROTDIR=${KDEHOME}/share/services | 28 | if [ -d "$LLKDEPROTODIR" ]; then |
| 29 | if [ -d "$LLKDEPROTDIR" ]; then | 29 | LLKDEPROTOFILE=${LLKDEPROTODIR}/secondlife.protocol |
| 30 | LLKDEPROTFILE=${LLKDEPROTDIR}/secondlife.protocol | 30 | cat > ${LLKDEPROTOFILE} <<EOF || echo Warning: Did not register secondlife:// handler with KDE: Could not write ${LLKDEPROTOFILE} |
| 31 | cat > ${LLKDEPROTFILE} <<EOF || echo Warning: Did not register secondlife:// handler with KDE: Could not write ${LLKDEPROTFILE} | ||
| 32 | [Protocol] | 31 | [Protocol] |
| 33 | exec=${HANDLER} '%u' | 32 | exec=${HANDLER} '%u' |
| 34 | protocol=secondlife | 33 | protocol=secondlife |
| @@ -41,6 +40,8 @@ writing=false | |||
| 41 | makedir=false | 40 | makedir=false |
| 42 | deleting=false | 41 | deleting=false |
| 43 | EOF | 42 | EOF |
| 44 | else | 43 | else |
| 45 | echo Info: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTDIR does not exist. You can safely ignore this if you are not using KDE. | 44 | echo Warning: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTODIR does not exist. |
| 46 | fi | 45 | fi |
| 46 | fi | ||
| 47 | done | ||