X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-repo;h=d1e75fbaf5d4b5bbe106aedcf6a4924b85620291;hp=250e1e75f0ca0b1ae38622d6faa15027125d7b0f;hb=fc00e5790546ea6120bb3e2f9ca1e95fbb74d9c3;hpb=43308b3c6fba1bcb7f4b10e67736cd981ed23540 diff --git a/zpm-repo b/zpm-repo index 250e1e7..d1e75fb 100755 --- a/zpm-repo +++ b/zpm-repo @@ -45,6 +45,13 @@ mkdir -p $repodir export ZPMDB +warn() { + printf '%s:' "$0" 1>&2 + printf ' %s' $* 1>&2 + printf '\n' 1>&2 + exit 1 +} + die() { printf '%s:' "$0" 1>&2 printf ' %s' $* 1>&2 @@ -92,6 +99,10 @@ update_info() { for repo in "$@"; do url=$(select "$repo" url) rf="$repodir/$repo.repo" + if [ -z "$url" ]; then + check_for_repo "$repo" || warn "no url for repo $repo" + return 1 + fi if [ -f "$rf" ]; then # TODO merge in so packages aren't deleted curl -f '-#' -z "$rf" -o "$rf.tmp" "$url" @@ -146,6 +157,15 @@ download() { done } +check_for_repo() { + rn=$(select "$1" name) + if [ -z "$rn" ]; then + warn "no repository $1" + return 1 + fi + return 0 +} + case $action in list) select '' priority,name,url,refreshed ;;