Fix unzip's helper to work with last set of changes.
--HG-- extra : convert_revision : 69852888e9293ee0bbbcd8aa380f8dc6a7403e02
This commit is contained in:
parent
16ae7bdf63
commit
21886c627f
1 changed files with 20 additions and 18 deletions
|
@ -3,13 +3,14 @@
|
|||
# This checks if unzip is installed and installs it if it's not
|
||||
# and sets the unzip_cmd/extract_cmd variables appropiately.
|
||||
#
|
||||
# If unzip is already installed just return immediately.
|
||||
if [ ! -x $PKGFS_MASTERDIR/bin/unzip ]; then
|
||||
unzip_version="5.52"
|
||||
|
||||
# Save pkgname before installing unzip.
|
||||
save_pkgname=$pkgname
|
||||
|
||||
# If unzip is already installed just return immediately.
|
||||
check_installed_tmpl unzip-$unzip_version
|
||||
check_installed_tmpl unzip $unzip_version
|
||||
if [ "$?" -ne 0 ]; then
|
||||
echo "=> unzip not installed, will install it."
|
||||
install_tmpl unzip
|
||||
|
@ -23,6 +24,7 @@ fi
|
|||
|
||||
unset save_pkgname
|
||||
unset unzip_version
|
||||
fi
|
||||
|
||||
unzip_cmd=$PKGFS_MASTERDIR/bin/unzip
|
||||
extract_cmd="$unzip_cmd -x $dfile -d $PKGFS_BUILDDIR"
|
||||
|
|
Loading…
Reference in a new issue