SliTaz Repositories

     1.1 --- a/tinyutils/tazx	Tue Nov 25 00:41:01 2014 +0200
     1.2 +++ b/tinyutils/tazx	Mon Dec 01 21:08:35 2014 +0000
     1.3 @@ -16,7 +16,6 @@
     1.4  
     1.5  . /lib/libtaz.sh
     1.6  . /etc/slitaz/slitaz.conf
     1.7 -. /etc/slitaz/applications.conf
     1.8  
     1.9  export TEXTDOMAIN='slitaz-tools' #i18n
    1.10  : ${DIALOG=dialog --timeout 60}
    1.11 @@ -299,6 +298,7 @@
    1.12  # Select/install Window Manager and favorite applications.
    1.13  
    1.14  apps_dialog() {
    1.15 +	slitaz_apps_conf
    1.16  	. $user_conf
    1.17  
    1.18  	exec 3>&1
    1.19 @@ -322,11 +322,12 @@
    1.20  	if [ $appname != " " ]; then
    1.21  		if [ $appname = show_ALL ]; then
    1.22  			app_name_dialog full-list
    1.23 +			inst_pkg $appname
    1.24  		fi
    1.25  		if [ -z $(busybox which $appname) ]; then
    1.26  			inst_pkg $(lzcat $PKGS_DB/files.list.lzma | fgrep /bin/$appname | head -n1 | cut -d: -f1)
    1.27  		fi
    1.28 -		sed -i "/$app/ s|=.*$|=$appname|" $user_conf
    1.29 +		sed -i "/$app/ s|=.*$|=\"$appname\"|" $user_conf
    1.30  	fi
    1.31  
    1.32  	msg=''; apps_dialog # loop
    1.33 @@ -362,13 +363,13 @@
    1.34  spacefm thunar xfe ytree"
    1.35  
    1.36  	BROWSERS="arora chrome cream dillo elinks firefox firefox-official iron \
    1.37 -links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb"
    1.38 +links lynx midori netsurf opera QtWeb qupzilla retawq seamonkey surf tazweb w3m xombrero"
    1.39  
    1.40 -	EDITORS="adie beaver emacs geany jed joe juffed ht le leafpad mcedit \
    1.41 -mousepad mp-5 nano qedit SciTE vi vim xedit xfw zile"
    1.42 +	EDITORS="adie beaver bluefish emacs geany jed joe juffed ht le leafpad \
    1.43 +mcedit mousepad mp-5 nano qedit SciTE tea vi vim xedit xfw zile"
    1.44  
    1.45  	TERMINALS="aterm evilvte lxterminal mrxvt qterminal sakura stjerm tilda \
    1.46 -urxvt vte xterm yeahconsole"
    1.47 +urxvt vte xfce4-terminal xterm yeahconsole"
    1.48  
    1.49  	WINDOW_MANAGERS="awesome blackbox compiz dwm echinus enlightenment fluxbox \
    1.50  icewm jwm lxde-session lxqt karmen matchbox openbox-session pekwm ratpoison \
    1.51 @@ -456,7 +457,6 @@
    1.52  			fi ;;
    1.53  
    1.54  		wm_apps)
    1.55 -			slitaz_apps_conf
    1.56  			apps_dialog ;;
    1.57  
    1.58  		*)
    1.59 @@ -472,6 +472,7 @@
    1.60  
    1.61  slitaz_apps_conf() {
    1.62  	apps_conf=/etc/slitaz/applications.conf
    1.63 +	[ -f $apps_conf ] || inst_pkg slitaz-configs --forced
    1.64  
    1.65  	if [ "$(id -u)" = 0 ]; then
    1.66  		user_conf=$apps_conf
    1.67 @@ -566,11 +567,9 @@
    1.68  		# User can get a new .xinitrc with tazx from cmdline.
    1.69  		case $(id -u) in
    1.70  			0)
    1.71 -				slitaz_apps_conf
    1.72  				config_dialog ;;
    1.73  			*)
    1.74  				msg="\Z1 $(_n 'Run tazx as root if you need to configure xorg') \Zn"
    1.75 -				slitaz_apps_conf
    1.76  				apps_dialog ;;
    1.77  		esac
    1.78  		# gen_xsession