slitaz-tools diff tinyutils/browser @ rev 938

tazbox tz: freegeoip.net not uses quotes in the CSV response anymore.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Apr 11 16:46:26 2015 +0300 (2015-04-11)
parents cd8b52f3f1ea
children 5d80f6fdbdb7
line diff
     1.1 --- a/tinyutils/browser	Fri Nov 14 21:53:07 2014 +0000
     1.2 +++ b/tinyutils/browser	Sat Apr 11 16:46:26 2015 +0300
     1.3 @@ -3,24 +3,27 @@
     1.4  #
     1.5  . /etc/slitaz/applications.conf
     1.6  
     1.7 -USER_CONFIG="$HOME/.config/slitaz/applications.conf"
     1.8 +USER_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/slitaz/applications.conf"
     1.9  [ -f  $USER_CONFIG ] && . $USER_CONFIG
    1.10  
    1.11  EXEC="exec setsid $BROWSER"
    1.12  
    1.13 -if [ ! -z $XAUTHORITY ]; then
    1.14 -	EXECT="terminal -e $BROWSER";
    1.15 -	case $BROWSER in links) EXECT="$EXEC -g" ;; esac
    1.16 +if [ -z "$XAUTHORITY" ]; then
    1.17 +	# console session
    1.18 +	EXECT="$BROWSER"
    1.19  else
    1.20 -	EXECT="$BROWSER";
    1.21 +	# Xorg session
    1.22 +	case $BROWSER in
    1.23 +		links) EXECT="$EXEC -g" ;;
    1.24 +		*)     EXECT="terminal -e $BROWSER" ;;
    1.25 +	esac
    1.26  fi
    1.27  
    1.28  case $BROWSER in
    1.29 -	*links*|retawq|lynx)
    1.30 -		$EXECT $@ ;;
    1.31 -	w3m)	$EXECT -N $@ ;;
    1.32 -	qupzil*)$EXEC -ow $@ ;;
    1.33 -	*)	$EXEC $@ ;;
    1.34 +	*links*|retawq|lynx) $EXECT    $@ ;;
    1.35 +	w3m)                 $EXECT -N $@ ;;
    1.36 +	qupzil*)             $EXEC -ow $@ ;;
    1.37 +	*)                   $EXEC     $@ ;;
    1.38  esac
    1.39  
    1.40  exit 0