Fix some obvious typos in two functions and misc cosmetics.
--HG-- extra : convert_revision : dd2c61c9db9152c323f4cc85158864246c00dcdf
This commit is contained in:
parent
493809cbe4
commit
c50217f5c8
15
pkgfs.sh
15
pkgfs.sh
|
@ -76,7 +76,8 @@ set_defvars()
|
||||||
|
|
||||||
local DDIRS="PKGFS_DEPSDIR PKGFS_TEMPLATESDIR PKGFS_TMPLHELPDIR"
|
local DDIRS="PKGFS_DEPSDIR PKGFS_TEMPLATESDIR PKGFS_TMPLHELPDIR"
|
||||||
for i in ${DDIRS}; do
|
for i in ${DDIRS}; do
|
||||||
if [ ! -d "$PKGFS_DEPSDIR" ]; then
|
eval val="\$$i"
|
||||||
|
if [ ! -d "$val" ]; then
|
||||||
echo "**** ERROR: cannot find $i, aborting ***"
|
echo "**** ERROR: cannot find $i, aborting ***"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -203,11 +204,7 @@ info_tmpl()
|
||||||
#
|
#
|
||||||
apply_tmpl_patches()
|
apply_tmpl_patches()
|
||||||
{
|
{
|
||||||
if [ -z "$PKGFS_TEMPLATESDIR" ]; then
|
local patch=
|
||||||
echo -n "*** WARNING: PKGFS_TEMPLATESDIR is not set, "
|
|
||||||
echo "won't apply patches ***"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If package needs some patches applied before building,
|
# If package needs some patches applied before building,
|
||||||
|
@ -290,7 +287,7 @@ check_config_vars()
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d "$f" ]; then
|
if [ ! -d "$val" ]; then
|
||||||
$mkdir_cmd "$val"
|
$mkdir_cmd "$val"
|
||||||
if [ "$?" -ne 0 ]; then
|
if [ "$?" -ne 0 ]; then
|
||||||
echo -n "*** ERROR: couldn't create '$f'"
|
echo -n "*** ERROR: couldn't create '$f'"
|
||||||
|
@ -412,6 +409,8 @@ check_rmd160_cksum()
|
||||||
echo "*** WARNING: checksum doesn't match (rmd160) ***"
|
echo "*** WARNING: checksum doesn't match (rmd160) ***"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "==> RMD160 checksum ok for \`$pkgname-$version'."
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -447,7 +446,7 @@ fetch_tmpl_sources()
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "==> Fetching \`$file2' source tarball"
|
echo "==> Fetching \`$file2' source tarball."
|
||||||
|
|
||||||
cd $PKGFS_SRCDISTDIR && $fetch_cmd $url/$file2
|
cd $PKGFS_SRCDISTDIR && $fetch_cmd $url/$file2
|
||||||
if [ "$?" -ne 0 ]; then
|
if [ "$?" -ne 0 ]; then
|
||||||
|
|
Loading…
Reference in New Issue
Block a user