summaryrefslogtreecommitdiff
path: root/bin/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'bin/pkg')
-rwxr-xr-xbin/pkg21
1 files changed, 13 insertions, 8 deletions
diff --git a/bin/pkg b/bin/pkg
index 82e05d1..b40ede0 100755
--- a/bin/pkg
+++ b/bin/pkg
@@ -465,6 +465,18 @@ function check_prereqs {
wrap_info $1
info "checking prerequisites\n"
+ # function scope → typeset and localoptions are possible
+ function source_prereqs {
+ {
+ source prereqs
+ } always {
+ if (( TRY_BLOCK_ERROR )) {
+ warn "Error in prereqs script\n"
+ TRY_BLOCK_ERROR=0
+ }
+ }
+ }
+
function is_installed {
[[ -d $PKG_DIR/$1 ]]
}
@@ -507,14 +519,7 @@ function check_prereqs {
}
}
- {
- source prereqs
- } always {
- if (( TRY_BLOCK_ERROR )) {
- warn "Error in prereqs script\n"
- TRY_BLOCK_ERROR=0
- }
- }
+ source_prereqs
if [[ -n $warn || -n $info ]] {
[[ -n $warn ]] && warn $warn