2010-01-23 [pawel] 3.7.4cvs9

[claws.git] / tools / popfile-link.sh

diff --git a/tools/popfile-link.sh b/tools/popfile-link.sh
index b1ff1ae9e7e10197a7e8a56ec4e81a1f06c6123c..f75a3f1d7a674adce3e83ef6f088fe6db5921190 100644 (file)
--- a/tools/popfile-link.sh
+++ b/tools/popfile-link.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash

 
 #  * Copyright 2007 Tristan Chabredier <wwp@claws-mail.org>
 #  *
 
 #  * Copyright 2007 Tristan Chabredier <wwp@claws-mail.org>
 #  *


@@ -24,13 +24,23 @@
 # the web browser set in Claws Mail prefs.
 
 
 # the web browser set in Claws Mail prefs.
 
 

-function open_page()
+open_page()

 {
 {

-       TMPCMD=$(echo $OPEN_CMD | sed "s:%s:$1:")
+       TMPCMD=$(echo $OPEN_CMD | sed "s|\"%s\"|$1|")

        $TMPCMD &
 }
 
 
        $TMPCMD &
 }
 
 

+SESSION_ID=""
+if [ "$1" = "--ask-session-id" ]
+then
+       shift
+       SESSION_ID=$(gxmessage -entry -center -wrap -buttons "OK:0,Cancel:1" -default "OK" \
+               -name "popfile-link" -title "POPFile session ID" "Type in the ID of a running POPFile session to use")
+       test -z "$SESSION_ID" -o $? -ne 0 && \
+               exit 0
+fi
+

 test -z "$1" && \
        exit 1
 
 test -z "$1" && \
        exit 1
 


@@ -39,7 +49,7 @@ test -z "$CM_DIR" -o ! -d "$HOME/$CM_DIR" && \
        exit 1
 
 OPEN_CMD=$(grep -Em 1 "^uri_open_command=" "$HOME/$CM_DIR/clawsrc" | cut -d '=' -f 2-)
        exit 1
 
 OPEN_CMD=$(grep -Em 1 "^uri_open_command=" "$HOME/$CM_DIR/clawsrc" | cut -d '=' -f 2-)

-test -z "$OPEN_CMD" || \
+test -z "$OPEN_CMD" && \

        exit 1
 
 while [ -n "$1" ]
        exit 1
 
 while [ -n "$1" ]


@@ -48,7 +58,12 @@ do
        if [ -n "$LINK" ]
        then
                LINK=${LINK:16}
        if [ -n "$LINK" ]
        then
                LINK=${LINK:16}

-               open_page "$LINK"
+               if [ -n "$SESSION_ID" ]
+               then
+                       open_page "${LINK}\\&session=$SESSION_ID"
+               else
+                       open_page "$LINK"
+               fi

        fi
        shift
 done
        fi
        shift
 done