tazpkg diff modules/install @ rev 846
Remove "busybox" "prefixes" (thanks llev)
We used "busybox wget", etc. to be sure we called Busybox's "wget", not any other "wget". Workaround already done in "getenv" module.
We used "busybox wget", etc. to be sure we called Busybox's "wget", not any other "wget". Workaround already done in "getenv" module.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Oct 09 13:14:01 2015 +0300 (2015-10-09) |
parents | ce7009ff237b |
children | 21ac83abe572 |
line diff
1.1 --- a/modules/install Tue Oct 06 15:46:41 2015 +0300 1.2 +++ b/modules/install Fri Oct 09 13:14:01 2015 +0300 1.3 @@ -78,7 +78,7 @@ 1.4 # Auto install or ask user then install all missing deps from local dir, CD-ROM, 1.5 # media or from the mirror. 1.6 1.7 -install_all_deps() { # READY!!! 1.8 +install_all_deps() { 1.9 # input: $1 = package file to check/install missing dependencies 1.10 # ROOT READY 1.11 # dep: equivalent_pkg. 1.12 @@ -258,7 +258,7 @@ 1.13 fi 1.14 1.15 } 1.16 - 1.17 +# Post-install commands 1.18 call_post_install() { 1.19 local tmp 1.20 if grep -q '^post_install()' "$1"; then 1.21 @@ -457,13 +457,13 @@ 1.22 fi 1.23 1.24 1.25 - if [ -n "$(busybox ls fs/* 2>/dev/null)" ]; then 1.26 + if [ -n "$(ls fs/* 2>/dev/null)" ]; then 1.27 action 'Installing package...' 1.28 1.29 debug '\n resolving destination links in source' 1.30 IFS=$'\n' 1.31 for dir in $(find fs -type d | sed 's|^fs||;/^$/d'); do 1.32 - if ldir=$(busybox readlink -n $root$dir); then 1.33 + if ldir=$(readlink -n $root$dir); then 1.34 debug " * mv 'fs$dir'\n -> 'fs${dir%/*}/$ldir'" 1.35 mkdir -p "fs${dir%/*}/${ldir%/*}" 1.36 mv "fs$dir" "fs${dir%/*}/$ldir"