tazpkg diff modules/convert @ 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 | a02e36d44d06 |
children | 879df9728956 |
line diff
1.1 --- a/modules/convert Fri Aug 28 16:10:34 2015 +0300 1.2 +++ b/modules/convert Fri Oct 09 13:14:01 2015 +0300 1.3 @@ -12,12 +12,10 @@ 1.4 TMP_DIR=$(mktemp -d) 1.5 TOP_DIR="$(pwd)" 1.6 1.7 -. /etc/slitaz/slitaz.conf 1.8 -. /lib/libtaz.sh 1.9 . @@MODULES@@/find-depends 1.10 1.11 -# Internationalization. 1.12 -export TEXTDOMAIN='tazpkg' 1.13 +# Get TazPkg working environment 1.14 +. @@MODULES@@/getenv 1.15 1.16 1.17 # FIXME: what does this mean? 1.18 @@ -213,7 +211,7 @@ 1.19 1.20 convert_nutyx() { 1.21 mkdir -p "$TMP_DIR/fs" 1.22 - busybox tar -xf "$PACKAGE_FILE" -C "$TMP_DIR/fs" 1.23 + tar -xf "$PACKAGE_FILE" -C "$TMP_DIR/fs" 1.24 if [ -f "$TMP_DIR/fs/.META" ]; then 1.25 package=$(sed '/^N/!d;s/^.//' fs/.META) 1.26 version=$(sed '/^V/!d;s/^.//' fs/.META) 1.27 @@ -248,7 +246,7 @@ 1.28 1.29 convert_arch() { 1.30 mkdir -p "$TMP_DIR/fs" 1.31 - busybox tar -xf "$PACKAGE_FILE" -C "$TMP_DIR/fs" 1.32 + tar -xf "$PACKAGE_FILE" -C "$TMP_DIR/fs" 1.33 if [ -f "$TMP_DIR/fs/.PKGINFO" ]; then 1.34 cd "$TMP_DIR" 1.35 package=$( sed '/^pkgname/!d;s/.*= //' fs/.PKGINFO)