jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't hardcode commands and don't require the global configuration

Browse source 
file to use the info target.

--HG--
extra : convert_revision : 26794799a354baebac87c41c54662ae28a7becda
This commit is contained in:
Juan RP 2008-09-26 23:39:29 +02:00
parent 084d6664b2
commit e36d3e4e5e
1 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
pkgfs.sh
View file

@ -43,6 +43,8 @@
: ${_CKSUM_CMD:=/usr/bin/cksum -a rmd160} : ${_CKSUM_CMD:=/usr/bin/cksum -a rmd160}
: ${_AWK_CMD:=/usr/bin/awk} : ${_AWK_CMD:=/usr/bin/awk}
: ${_MKDIR_CMD:=/bin/mkdir -p} : ${_MKDIR_CMD:=/bin/mkdir -p}
: ${_TAR_CMD:=/usr/bin/tar}
: ${_UNZIP_CMD:=/usr/pkg/bin/unzip}
_SFILE= _SFILE=
_EXTRACT_CMD= _EXTRACT_CMD=
@ -83,7 +85,7 @@ check_path()
_SFILE="$orig" _SFILE="$orig"
} }
show_info_from_buildfile() show_info_from_local_tmpl()
{ {
echo "Template build file definitions:" echo "Template build file definitions:"
echo echo
@ -122,24 +124,24 @@ check_build_vars()
eval i=\""$$i\"" eval i=\""$$i\""
if [ -z "$i" ]; then if [ -z "$i" ]; then
echo -n "*** ERROR: $i not set (incomplete build" echo -n "*** ERROR: $i not set (incomplete build"
echo " file), aborting ***" echo " file), aborting ***"
exit 1 exit 1
fi fi
done done
case "$extract_sufx" in case "$extract_sufx" in
.tar.bz2|.tar.gz|.tgz|.tbz) .tar.bz2|.tar.gz|.tgz|.tbz)
_EXTRACT_CMD="tar xvfz $dfile -C $PKGFS_BUILDDIR" _EXTRACT_CMD="${_TAR_CMD} xvfz $dfile -C $PKGFS_BUILDDIR"
;; ;;
.tar) .tar)
_EXTRACT_CMD="tar xvf $dfile -C $PKGFS_BUILDDIR" _EXTRACT_CMD="${_TAR_CMD} xvf $dfile -C $PKGFS_BUILDDIR"
;; ;;
.zip) .zip)
_EXTRACT_CMD="unzip -x $dfile -C $PKGFS_BUILDDIR" _EXTRACT_CMD="${_UNZIP_CMD} -x $dfile -C $PKGFS_BUILDDIR"
;; ;;
*) *)
echo -n "*** ERROR: unknown 'extract_sufx' argument in build " echo -n "*** ERROR: unknown 'extract_sufx' argument in build "
echo "file ***" echo "file ***"
exit 1 exit 1
;; ;;
esac esac
@ -210,6 +212,27 @@ fetch_source_distfiles()
check_build_dirs() check_build_dirs()
{ {
check_path "${PKGFS_CONFIG_FILE}"
. ${_SFILE}
if [ ! -f "${PKGFS_CONFIG_FILE}" ]; then
echo -n "*** ERROR: cannot find global config file: "
echo "'${PKGFS_CONFIG_FILE}' ***"
exit 1
fi
if [ -z "${PKGFS_DESTDIR}" ]; then
echo -n "*** ERROR: PKGFS_DESTDIR not set in configuration"
echo " file ***"
exit 1
fi
if [ -z "${PKGFS_BUILDDIR}" ]; then
echo -n "*** ERROR PKGFS_BUILDDIR not set in configuration"
echo " file ***"
exit 1;
fi
if [ ! -d "$PKGFS_DESTDIR" ]; then if [ ! -d "$PKGFS_DESTDIR" ]; then
${_MKDIR_CMD} "$PKGFS_DESTDIR" ${_MKDIR_CMD} "$PKGFS_DESTDIR"
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
@ -242,7 +265,6 @@ check_build_dirs()
build_pkg() build_pkg()
{ {
echo "*** Extracting package: $pkgname ***" echo "*** Extracting package: $pkgname ***"
${_EXTRACT_CMD} ${_EXTRACT_CMD}
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
@ -303,8 +325,8 @@ build_pkg()
build_pkg_from_source() build_pkg_from_source()
{ {
check_build_vars
check_build_dirs check_build_dirs
check_build_vars
fetch_source_distfiles fetch_source_distfiles
build_pkg build_pkg
} }
@ -353,24 +375,6 @@ fi
check_path "${_buildfile}" check_path "${_buildfile}"
. ${_SFILE} . ${_SFILE}
if [ ! -f "${PKGFS_CONFIG_FILE}" ]; then
echo -n "*** ERROR: cannot find global config file: "
echo "'${PKGFS_CONFIG_FILE}' ***"
exit 1
fi
check_path "${PKGFS_CONFIG_FILE}"
. ${_SFILE}
if [ -z "${PKGFS_DESTDIR}" ]; then
echo "*** ERROR: PKGFS_DESTDIR not set in configuration file ***"
exit 1
fi
if [ -z "${PKGFS_BUILDDIR}" ]; then
echo "*** ERROR PKGFS_BUILDDIR not set in configuration file ***"
exit 1;
fi
# Main switch # Main switch
case "${_target}" in case "${_target}" in
@ -378,7 +382,7 @@ build)
build_pkg_from_source build_pkg_from_source
;; ;;
info) info)
show_info_from_buildfile show_info_from_local_tmpl
;; ;;
*) *)
echo "*** ERROR invalid target '${_target}' ***" echo "*** ERROR invalid target '${_target}' ***"