SliTaz Repositories

     1.1 --- a/sup	Fri Mar 10 00:00:36 2017 +0100
     1.2 +++ b/sup	Fri Mar 10 09:12:43 2017 +0100
     1.3 @@ -30,12 +30,12 @@
     1.4  $(boldify $(gettext "Usage:")) $(basename $0) [command|package] [package]
     1.5  
     1.6  $(boldify $(gettext "Commands:"))
     1.7 -  -c  cook           $(gettext "Cook a package from the wok")
     1.8 -  -r  run            $(gettext "Run sup_install without installing")
     1.9 -  -e  extract        $(gettext "Extract a package to current dir")
    1.10    -i  install        $(gettext "Install a new package")
    1.11    -u  update         $(gettext "Update installed package")
    1.12    -r  remove         $(gettext "Remove an installed package")
    1.13 +  -c  cook           $(gettext "Cook a package from the wok")
    1.14 +      run            $(gettext "Run sup_install without installing")
    1.15 +  -e  extract        $(gettext "Extract a package to current dir")
    1.16    -n  new            $(gettext "Create a new SUP package :-)")
    1.17    -l  list           $(gettext "List packages: installed/wok/db")
    1.18    -s  search         $(gettext "Search for packages in the database")
    1.19 @@ -172,7 +172,7 @@
    1.20  		echo "$(gettext 'Packages:') $(colorize 035 $supfile) ($size)"
    1.21  		rm -rf ${cache} && newline ;;
    1.22  	
    1.23 -	-r|run)
    1.24 +	run)
    1.25  		# Run sup_install() without any installation to help package creation
    1.26  		pkg="$2"
    1.27  		receip="$wok/$pkg/receip"
    1.28 @@ -292,10 +292,10 @@
    1.29  		gettext "Checking packages.sql..."
    1.30  		db_sum=$(wget -q "${server}?sup=dbsum" -O -)
    1.31  		if echo "$db_sum  $pkgsdb" | md5sum -s -c -; then
    1.32 -			indent $(($(tty_size) - 13)) "[ $(colorize 036 synced) ]"
    1.33 +			info 036 "synced"
    1.34  		else
    1.35  			[ "$online" ] && rm -f ${pkgsdb}
    1.36 -			indent $(($(tty_size) - 13)) "[ $(colorize 035 update) ]"
    1.37 +			info 035 "update"
    1.38  		fi
    1.39  		
    1.40  		# --force
    1.41 @@ -310,7 +310,12 @@
    1.42  				| awk '{printf $1 " " $2}')
    1.43  			gettext "Database timestamp:"
    1.44  			indent $(($(tty_size) - 23)) "[ $(colorize 30 $timestamp) ]"
    1.45 -			log "$(gettext 'Updated packages database: $timestamp') "
    1.46 +			log "$(gettext 'Updated packages database:') $timestamp"
    1.47 +		fi
    1.48 +		
    1.49 +		# Exit now if no packages.sql
    1.50 +		if [ ! -f "$pkgsdb" ]; then
    1.51 +			gettext "Please try later. Missing packages database"; echo; exit 1
    1.52  		fi
    1.53  		
    1.54  		# Scan installed packages
    1.55 @@ -319,34 +324,40 @@
    1.56  		in=$((7 + ${char}))
    1.57  		
    1.58  		gettext "Installed packages:"
    1.59 -		indent $(($(tty_size) - ${in})) "[ $(colorize 033 $count) ]"
    1.60 -		cat << EOT
    1.61 +		info 033 "$count"; newline
    1.62 +		echo -n $(boldify $(gettext "Package") $(indent 30 $(gettext "Version")))
    1.63 +		info 40 $(gettext "Status")
    1.64 +		separator "-"
    1.65  
    1.66 -$(boldify $(gettext "Package") $(indent 30 $(gettext "Version")) \
    1.67 -$(indent 60 $(gettext "Status")))
    1.68 -$(separator "-")
    1.69 -EOT
    1.70  		for pkg in $(ls $installed)
    1.71  		do
    1.72  			. ${installed}/${pkg}/receip
    1.73 -			db_sum=$(sqlite3 ${pkgsdb} \
    1.74 -				"SELECT md5sum FROM pkgs WHERE name = '$pkg'")
    1.75  			
    1.76 -			# MD5sum not matching: new version our new build ?
    1.77 -			if [ "$md5_sum" != "$db_sum" ]; then
    1.78 -			
    1.79 -				vers=$(sqlite3 ${pkgsdb} \
    1.80 -					"SELECT version FROM pkgs WHERE name = '$pkg'")
    1.81 +			name=$(sqlite3 ${pkgsdb} \
    1.82 +				"SELECT name FROM pkgs WHERE name = '$pkg'")
    1.83 +			if [ ! "$name" ]; then
    1.84 +				#echo -n "$pkg $(indent 30 $VERSION)"
    1.85 +				#info 036 "$(gettext "local")"
    1.86 +				continue
    1.87 +			else
    1.88 +				db_sum=$(sqlite3 ${pkgsdb} \
    1.89 +					"SELECT md5sum FROM pkgs WHERE name = '$pkg'")
    1.90  				
    1.91 -				if [ "$VERSION" != "$vers" ]; then
    1.92 -					status="$(colorize 032 $(gettext "update") )"
    1.93 -				else
    1.94 -					status="$(colorize 035 $(gettext "rebuilt"))"
    1.95 +				# MD5sum not matching: new version our new build ?
    1.96 +				if [ "$md5_sum" != "$db_sum" ]; then
    1.97 +					echo -n "$pkg $(indent 30 $VERSION)"
    1.98 +					vers=$(sqlite3 ${pkgsdb} \
    1.99 +						"SELECT version FROM pkgs WHERE name = '$pkg'")
   1.100 +					
   1.101 +					if [ "$VERSION" != "$vers" ]; then
   1.102 +						info 032 "$(gettext "$vers")"
   1.103 +					else
   1.104 +						info 035 "$(gettext "rebuilt")"
   1.105 +					fi
   1.106 +					echo "$pkg" >> ${cache}/updates
   1.107  				fi
   1.108 -				echo "$pkg $(indent 30 $VERSION) $(indent 60 $status)"
   1.109 -				echo "$pkg" >> ${cache}/updates
   1.110  			fi
   1.111 -			
   1.112 +			unset name db_sum vers
   1.113  		done
   1.114  		
   1.115  		if [ -f "$cache/updates" ]; then