X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-repo;h=76359b8e2f6679ae2f80b01ea3779d1acf6a3b30;hp=737e9af46e7a79d26d9fd615c11b26f85263527a;hb=09c80a1f8918d888063f4d1a75921a99fe5f0b5c;hpb=e981a811e7f1b1a3140d3582bf4f1fd70c70f743 diff --git a/zpm-repo b/zpm-repo index 737e9af..76359b8 100755 --- a/zpm-repo +++ b/zpm-repo @@ -105,24 +105,23 @@ update_info() { fi if [ -f "$rf" ]; then # TODO merge in so packages aren't deleted - curl -f '-#' -z "$rf" -o "$rf.tmp" "$url" + zpm fetchurl -fpn -z "$rf" -o "$rf.tmp" "$url" rv=$? else - curl -f '-#' -o "$rf" "$url" && refresh "$repo" + zpm fetchurl -fpn -o "$rf.tmp" "$url" && refresh "$repo" rv=$? fi if [ $rv -eq 0 ]; then - test -f "$rf.tmp" && mv "$rf.tmp" "$rf" + test -f "$rf.tmp" && + zpm test "$rf.tmp" && + mv "$rf.tmp" "$rf" refresh "$repo" fi done } -# response=$(curl --write-out %{http_code} --silent --output /dev/null servername) -# --head - head_response_code() { - curl --write-out '%{http_code}' --silent --output /dev/null -z $2 $1 + zpm fetchurl -S -z "$2" "$1" } download() { @@ -146,11 +145,11 @@ download() { continue fi echo downloading $pkgid - curl -f '-#' -z "$dest" -o "$dest.tmp" $fetch + zpm fetchurl -f '-#' -z "$dest" -o "$dest.tmp" $fetch mv "$dest.tmp" "$dest" else echo downloading $pkgid - curl -f '-#' -o "$dest.tmp" $fetch + zpm fetchurl -f '-#' -o "$dest.tmp" $fetch mv "$dest.tmp" "$dest" fi fi