SliTaz Repositories

     1.1 --- a/tazbox/tazbox	Fri Jul 31 17:21:47 2015 +0300
     1.2 +++ b/tazbox/tazbox	Wed Aug 05 02:34:39 2015 +0300
     1.3 @@ -12,6 +12,11 @@
     1.4  export TEXTDOMAIN='tazbox' # i18n
     1.5  
     1.6  
     1.7 +# Get SliTaz settings
     1.8 +
     1.9 +. /etc/slitaz/slitaz.conf
    1.10 +
    1.11 +
    1.12  # download dir (may be in a config file)
    1.13  
    1.14  DOWNLOADS="$HOME/Downloads"
    1.15 @@ -377,14 +382,14 @@
    1.16  # if installed
    1.17  
    1.18  if_installed() {
    1.19 -	[ -d /var/lib/tazpkg/installed/$1 ]
    1.20 +	[ -d "$INSTALLED/$1" ]
    1.21  }
    1.22  
    1.23  
    1.24  # get package's description, install flag and sizes
    1.25  
    1.26  desc_etc() {
    1.27 -	if grep -q "^$1"$'\t' /var/lib/tazpkg/installed.info; then
    1.28 +	if grep -q "^$1"$'\t' "$PKGS_DB/installed.info"; then
    1.29  		echo 'TRUE' >> $PKGS_LIST; echo $1 >> $ORIG_LIST
    1.30  	else
    1.31  		echo 'FALSE' >> $PKGS_LIST
    1.32 @@ -393,7 +398,7 @@
    1.33  		($1==p){
    1.34  			split($7, s, " ");
    1.35  			printf "%s\n%s\n%s\n%s\n", $1, $4, s[1], s[2];
    1.36 -		}' /var/lib/tazpkg/packages.info >> $PKGS_LIST
    1.37 +		}' "$PKGS_DB/packages.info" >> $PKGS_LIST
    1.38  }
    1.39  
    1.40  
    1.41 @@ -407,16 +412,30 @@
    1.42  # install/remove locale packages
    1.43  
    1.44  manage_i18n() {
    1.45 -	tazbox notify "$(_ 'Please wait')" appointment-soon &
    1.46 -
    1.47  	PKGS_LIST=$(mktemp)
    1.48  	ORIG_LIST=$(mktemp)
    1.49  	ANSWER=$(mktemp)
    1.50  	NEW_LIST=$(mktemp)
    1.51  	LIST1=$(mktemp)
    1.52  	LIST2=$(mktemp)
    1.53 -	PLIST='/var/lib/tazpkg/packages.list'
    1.54 -	PINFO='/vat/lib/tazpkg/packages.info'
    1.55 +	PINFO="$PKGS_DB/packages.info"
    1.56 +
    1.57 +	if [ ! -e "$PINFO" ]; then
    1.58 +		icon='dialog-warning'
    1.59 +		yad --title="$(_n 'Manage locale packages')" --window-icon="$icon" \
    1.60 +			--width='400' --on-top --center \
    1.61 +			--image="$icon" --image-on-top \
    1.62 +			--text="$(_n 'Please, recharge packages database.')" \
    1.63 +			--button="$(_n 'Recharge list')!reload:2" \
    1.64 +			--button="gtk-cancel:1"
    1.65 +
    1.66 +		case "$?" in
    1.67 +			1) rm_tmp; return;;
    1.68 +			2) tazbox recharge;;
    1.69 +		esac
    1.70 +	fi
    1.71 +
    1.72 +	tazbox notify "$(_ 'Please wait')" appointment-soon &
    1.73  
    1.74  	for i in $(awk -F$'\t' '$1~/^locale-[a-z_A-Z]+$/{print $1}' $PINFO); do
    1.75  		desc_etc $i
    1.76 @@ -482,13 +501,16 @@
    1.77  		--column="$(_n 'Inst.'):CHK" --column="$(_n 'Package Name'):TEXT" \
    1.78  		--column="$(_n 'Description'):TEXT" --column="$(_n 'Size'):TEXT" \
    1.79  		--column="$(_n 'Installed'):TEXT" \
    1.80 -		--button="$(_n 'Recharge list')!reload:tazbox recharge" \
    1.81 +		--button="$(_n 'Recharge list')!reload:4" \
    1.82  		--button="$(_n 'Install/Remove')!system-upgrade:2" \
    1.83  		--button="gtk-cancel:1" \
    1.84  		--print-all
    1.85  	} > $ANSWER
    1.86  
    1.87 -	if [ "$?" -eq 1 ]; then rm_temp; exit 0; fi
    1.88 +	case "$?" in
    1.89 +		1) rm_temp; exit 0;;
    1.90 +		4) tazbox recharge; rm_tmp; tazbox manage_i18n; exit 0;;
    1.91 +	esac
    1.92  
    1.93  	grep -e 'TRUE' $ANSWER | cut -d'|' -f2 > $NEW_LIST
    1.94  
    1.95 @@ -676,7 +698,7 @@
    1.96  		;;
    1.97  
    1.98  	recharge)
    1.99 -		ask_root $@; opts='--on-top'; tazpkg recharge | output_command
   1.100 +		ask_root $@; opts='--on-top'; output=raw tazpkg recharge | output_command
   1.101  		;;
   1.102  
   1.103  	setup)