Fix remove_tmpl() and misc cosmetics to info_tmpl().
--HG-- extra : convert_revision : fa0c299f6d8a85c2a99932eef471dd46a5c31a9c
This commit is contained in:
parent
78dfdd4241
commit
ff05dd1e42
1 changed files with 11 additions and 12 deletions
23
pkgfs.sh
23
pkgfs.sh
|
@ -174,25 +174,24 @@ info_tmpl()
|
||||||
|
|
||||||
run_file $PKGFS_TEMPLATESDIR/$tmpl.tmpl
|
run_file $PKGFS_TEMPLATESDIR/$tmpl.tmpl
|
||||||
|
|
||||||
echo " pkgfs template definitions:"
|
echo "pkgname: $pkgname"
|
||||||
echo
|
echo "version: $version"
|
||||||
echo " pkgname: $pkgname"
|
|
||||||
for i in "${distfiles}"; do
|
for i in "${distfiles}"; do
|
||||||
[ -n "$i" ] && echo " distfile: $i"
|
[ -n "$i" ] && echo "distfile: $i"
|
||||||
done
|
done
|
||||||
echo " URL: $url"
|
echo "URL: $url"
|
||||||
echo " maintainer: $maintainer"
|
echo "maintainer: $maintainer"
|
||||||
[ -n $checksum ] && echo " checksum: $checksum"
|
[ -n $checksum ] && echo "checksum: $checksum"
|
||||||
echo " build_style: $build_style"
|
echo "build_style: $build_style"
|
||||||
echo " short_desc: $short_desc"
|
echo "short_desc: $short_desc"
|
||||||
echo "$long_desc"
|
echo "$long_desc"
|
||||||
echo
|
echo
|
||||||
check_build_depends_tmpl $pkgname
|
check_build_depends_tmpl $pkgname
|
||||||
if [ "$?" -eq 0 ]; then
|
if [ "$?" -eq 0 ]; then
|
||||||
local list="$($db_cmd -V btree $PKGFS_BUILD_DEPS_DB $pkgname)"
|
local list="$($db_cmd -V btree $PKGFS_BUILD_DEPS_DB $pkgname)"
|
||||||
echo " This package requires the following dependencies to be built:"
|
echo "This package requires the following dependencies to be built:"
|
||||||
for i in ${list}; do
|
for i in ${list}; do
|
||||||
echo " $i"
|
echo " $i"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -1053,7 +1052,7 @@ remove_tmpl()
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
unstow_tmpl $pkg-$version
|
unstow_tmpl $pkg
|
||||||
$rm_cmd -rf $PKGFS_DESTDIR/$pkg-$version
|
$rm_cmd -rf $PKGFS_DESTDIR/$pkg-$version
|
||||||
return "$?"
|
return "$?"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue