tazpkg diff modules/install @ rev 968
Modules "get" and "install": initial support for Cooker contain two architectures packages in one "packages" folder
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon Nov 26 12:33:58 2018 +0200 (2018-11-26) |
parents | 3817dcb25419 |
children | f079c87ba419 |
line diff
1.1 --- a/modules/install Mon Feb 26 00:54:19 2018 +0200 1.2 +++ b/modules/install Mon Nov 26 12:33:58 2018 +0200 1.3 @@ -47,6 +47,7 @@ 1.4 # Search for virtual packages 1.5 if [ -n "$cookmode" ]; then 1.6 pi='/home/slitaz/packages/packages.info' 1.7 + [ -e "$pi" ] || pi="/home/slitaz/packages/packages-$SLITAZ_ARCH.info" 1.8 else 1.9 pi="$(dirname "$2")/packages.info" 1.10 fi 1.11 @@ -183,6 +184,7 @@ 1.12 [ -z "$quiet" ] && _ 'Checking if package "%s" exists in local list...' "$pkg" 1.13 [ -n "$cookmode" ] && dir='/home/slitaz/packages' 1.14 pi="$dir/packages.info" 1.15 + [ -e "$pi" ] || pi="$dir/packages-$SLITAZ_ARCH.info" 1.16 # Find local package 1.17 if [ -f "$pi" ]; then 1.18 # Packages database exists (should be everfresh!) 1.19 @@ -271,8 +273,14 @@ 1.20 done 1.21 1.22 # Try to find short description for mirrored package 1.23 - [ -z "$short_desc" -a -s "$PKGS_DB/packages.info" ] && 1.24 - short_desc=$(awk -F$'\t' -vp="$1" '$1==p{print $4; exit}' "$PKGS_DB/packages.info") 1.25 + if [ -z "$short_desc" ]; then 1.26 + if [ -e "$PKGS_DB/packages.info" ]; then 1.27 + pi="$PKGS_DB/packages.info" 1.28 + else 1.29 + "$PKGS_DB/packages-$SLITAZ_ARCH.info" 1.30 + fi 1.31 + short_desc=$(awk -F$'\t' -vp="$1" '$1==p{print $4; exit}' "$pi") 1.32 + fi 1.33 1.34 [ -z "$short_desc" ] && short_desc="$SHORT_DESC" 1.35