tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix unzip's helper to work with last set of changes.

Browse Source 
--HG--
extra : convert_revision : 69852888e9293ee0bbbcd8aa380f8dc6a7403e02
This commit is contained in:
Juan RP 2008-10-06 02:51:34 +02:00
parent 16ae7bdf63
commit 21886c627f
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
helper-templates/unzip-extraction.sh
View File

@ -3,26 +3,28 @@
# This checks if unzip is installed and installs it if it's not # This checks if unzip is installed and installs it if it's not
# and sets the unzip_cmd/extract_cmd variables appropiately. # and sets the unzip_cmd/extract_cmd variables appropiately.
# #
unzip_version="5.52"
# Save pkgname before installing unzip.
save_pkgname=$pkgname
# If unzip is already installed just return immediately. # If unzip is already installed just return immediately.
check_installed_tmpl unzip-$unzip_version if [ ! -x $PKGFS_MASTERDIR/bin/unzip ]; then
if [ "$?" -ne 0 ]; then unzip_version="5.52"
echo "=> unzip not installed, will install it."
install_tmpl unzip
#
# Continue with previous template that called us.
#
reset_tmpl_vars
run_file $PKGFS_TEMPLATESDIR/$save_pkgname.tmpl
check_tmpl_vars $save_pkgname
fi
unset save_pkgname # Save pkgname before installing unzip.
unset unzip_version save_pkgname=$pkgname
check_installed_tmpl unzip $unzip_version
if [ "$?" -ne 0 ]; then
echo "=> unzip not installed, will install it."
install_tmpl unzip
#
# Continue with previous template that called us.
#
reset_tmpl_vars
run_file $PKGFS_TEMPLATESDIR/$save_pkgname.tmpl
check_tmpl_vars $save_pkgname
fi
unset save_pkgname
unset unzip_version
fi
unzip_cmd=$PKGFS_MASTERDIR/bin/unzip unzip_cmd=$PKGFS_MASTERDIR/bin/unzip
extract_cmd="$unzip_cmd -x $dfile -d $PKGFS_BUILDDIR" extract_cmd="$unzip_cmd -x $dfile -d $PKGFS_BUILDDIR"