|
 |
6a9a27 |
--- orig-1.0.9/wl_reader/bltk_wl_reader.sh 2009-04-10 09:14:20.000000000 +0200
|
|
|
6a9a27 |
+++ curr-1.0.9-1/wl_reader/bltk_wl_reader.sh 2009-07-17 11:03:55.065881503 +0200
|
|
|
6a9a27 |
@@ -38,6 +38,7 @@
|
|
|
6a9a27 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
6a9a27 |
#
|
|
|
6a9a27 |
|
|
|
6a9a27 |
+[ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
|
|
|
6a9a27 |
|
|
|
6a9a27 |
source `dirname $0`/../../bin/bltk_wl_common
|
|
|
6a9a27 |
[[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
|
|
|
6a9a27 |
@@ -48,6 +49,13 @@
|
|
|
6a9a27 |
|
|
|
6a9a27 |
XSE_PROG="bltk_wl_reader_xse"
|
|
|
6a9a27 |
|
|
|
6a9a27 |
+WL_READER_WORKING_DIR=${WL_READER_WORKING_DIR:-"~/.bltk"}
|
|
|
6a9a27 |
+cd $WL_READER_WORKING_DIR
|
|
|
6a9a27 |
+WL_READER_WORKING_DIR=`pwd`
|
|
|
6a9a27 |
+cd $OLDPWD
|
|
|
6a9a27 |
+
|
|
|
6a9a27 |
+export USER_DELAY_TMP=$BLTK_HOME/user_delay.tmp
|
|
|
6a9a27 |
+
|
|
|
6a9a27 |
startup()
|
|
|
6a9a27 |
{
|
|
|
6a9a27 |
trap 'cleanup 1; exit 1' 1 2 3 15
|
|
|
6a9a27 |
@@ -58,35 +66,35 @@
|
|
|
6a9a27 |
### wl_check_install reader
|
|
|
6a9a27 |
### wl_check_error $?
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- if [[ -z $BLTK_WL_PROG ]]
|
|
|
6a9a27 |
+ if [[ -z $BLTK_READER_PROG ]]
|
|
|
6a9a27 |
then
|
|
|
6a9a27 |
- export BLTK_WL_PROG=$DEF_BROWSER
|
|
|
6a9a27 |
- export BLTK_WL_PROG_FLG=
|
|
|
6a9a27 |
+ export BLTK_READER_PROG=$DEF_BROWSER
|
|
|
6a9a27 |
+ export BLTK_READER_PROG_FLG=
|
|
|
6a9a27 |
fi
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- wl_check_prog $BLTK_WL_PROG
|
|
|
6a9a27 |
+ wl_check_prog $BLTK_READER_PROG
|
|
|
6a9a27 |
wl_check_error $?
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- wl_check_run_prog $BLTK_WL_PROG
|
|
|
6a9a27 |
+ wl_check_run_prog $BLTK_READER_PROG
|
|
|
6a9a27 |
wl_check_error $?
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- echo "Browser $BLTK_WL_PROG"
|
|
|
6a9a27 |
+ echo "Browser $BLTK_READER_PROG"
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- wl_check_all_run_prog $BLTK_WL_PROG
|
|
|
6a9a27 |
+ wl_check_all_run_prog $BLTK_READER_PROG
|
|
|
6a9a27 |
wl_check_error $?
|
|
|
6a9a27 |
|
|
|
6a9a27 |
tmp_reader_file=/tmp/$DEF_FILE
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- if [[ $BLTK_WL_FILE = DEBUG ]]
|
|
|
6a9a27 |
+ if [[ $BLTK_READER_FILE = DEBUG ]]
|
|
|
6a9a27 |
then
|
|
|
6a9a27 |
- BLTK_WL_FILE=
|
|
|
6a9a27 |
+ BLTK_READER_FILE=
|
|
|
6a9a27 |
fi
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- if [[ ! -z $BLTK_WL_FILE ]]
|
|
|
6a9a27 |
+ if [[ ! -z $BLTK_READER_FILE ]]
|
|
|
6a9a27 |
then
|
|
|
6a9a27 |
- reader_file=$BLTK_WL_FILE
|
|
|
6a9a27 |
+ reader_file=$BLTK_READER_FILE
|
|
|
6a9a27 |
title="$BLTK_WL_TITLE"
|
|
|
6a9a27 |
- flags="$BLTK_WL_PROG_FLG"
|
|
|
6a9a27 |
+ flags="$BLTK_READER_PROG_FLG"
|
|
|
6a9a27 |
else
|
|
|
6a9a27 |
default_flg=TRUE
|
|
|
6a9a27 |
reader_file=$DEF_FILE
|
|
|
6a9a27 |
@@ -139,13 +147,13 @@
|
|
|
6a9a27 |
{
|
|
|
6a9a27 |
ST_TIME=`$BLTK_TIME_CMD`
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- rm -f ./user_delay.tmp
|
|
|
6a9a27 |
+ rm -f $USER_DELAY_TMP
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- CMD="$BLTK_WL_PROG $BLTK_WL_PROG_FLG $reader_file"
|
|
|
6a9a27 |
+ CMD="$BLTK_READER_PROG $BLTK_WL_PROG_FLG $reader_file"
|
|
|
6a9a27 |
$CMD &
|
|
|
6a9a27 |
wl_check_error $? "$CMD failed"
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- BLTK_WL_ALL_PROC_NAME="$BLTK_WL_ALL_PROC_NAME $BLTK_WL_PROG"
|
|
|
6a9a27 |
+ BLTK_WL_ALL_PROC_NAME="$BLTK_WL_ALL_PROC_NAME $BLTK_READER_PROG"
|
|
|
6a9a27 |
|
|
|
6a9a27 |
windowid=`bltk_winid -S "$title"`
|
|
|
6a9a27 |
wl_check_error $? "Cannot get windowid of $BLTK_WL_PRO"
|
|
|
6a9a27 |
@@ -157,11 +165,17 @@
|
|
|
6a9a27 |
|
|
|
6a9a27 |
CMD="$BLTK_WL_BIN/$XSE_PROG"
|
|
|
6a9a27 |
$CMD
|
|
|
6a9a27 |
+ if [ -f $BLTK_STOP_FNAME ]
|
|
|
6a9a27 |
+ then
|
|
|
6a9a27 |
+ ps -eopid,cmd | grep $BLTK_READER_PROG | sed 's/^ *//' | sed 's/ .*$//' | xargs kill -s SIGKILL
|
|
|
6a9a27 |
+ exit 0
|
|
|
6a9a27 |
+ fi
|
|
|
6a9a27 |
+
|
|
|
6a9a27 |
wl_check_error $? "$CMD failed"
|
|
|
6a9a27 |
|
|
|
6a9a27 |
BLTK_WL_PROC_NAME="$BLTK_WL_PROC_NAME $XSE_PROG"
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- CMD="cat ./user_delay.tmp"
|
|
|
6a9a27 |
+ CMD="cat $USER_DELAY_TMP"
|
|
|
6a9a27 |
DELAY_TIME=`$CMD`
|
|
|
6a9a27 |
wl_check_error $? "$CMD failed"
|
|
|
6a9a27 |
|
|
|
6a9a27 |
@@ -200,7 +214,12 @@
|
|
|
6a9a27 |
exit $1
|
|
|
6a9a27 |
}
|
|
|
6a9a27 |
|
|
|
6a9a27 |
-startup
|
|
|
6a9a27 |
-run
|
|
|
6a9a27 |
-cleanup 0
|
|
|
6a9a27 |
+if [ "$WL_READER_ENABLED" = "YES" ]
|
|
|
6a9a27 |
+then
|
|
|
6a9a27 |
+ startup
|
|
|
6a9a27 |
+ run
|
|
|
6a9a27 |
+ cleanup 0
|
|
|
6a9a27 |
+else
|
|
|
6a9a27 |
+ exit 0
|
|
|
6a9a27 |
+fi
|
|
|
6a9a27 |
|
|
|
6a9a27 |
--- orig-1.0.9/wl_reader/bltk_wl_reader_xse.c 2009-04-10 09:14:20.000000000 +0200
|
|
|
6a9a27 |
+++ curr-1.0.9-1/wl_reader/bltk_wl_reader_xse.c 2009-07-17 11:03:55.065881503 +0200
|
|
|
6a9a27 |
@@ -108,7 +108,7 @@
|
|
|
6a9a27 |
}
|
|
|
6a9a27 |
}
|
|
|
6a9a27 |
|
|
|
6a9a27 |
- env = getenv("BLTK_WL_PROG");
|
|
|
6a9a27 |
+ env = getenv("BLTK_READER_PROG");
|
|
|
6a9a27 |
if (env && strcmp(env, "konqueror") == 0) {
|
|
|
6a9a27 |
scen[LINE_QUIT].string = "Q";
|
|
|
6a9a27 |
}
|