Skip to content

Commit

Permalink
cleaner output
Browse files Browse the repository at this point in the history
  • Loading branch information
niaow committed Nov 22, 2017
1 parent 0dae5e3 commit 977491f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion fetchers/http.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ if [ $# -ne 3 ]; then
exit 1
fi

wget "http://$1/$2" -O "$3" || exit 2
wget -q "http://$1/$2" -O "$3" || exit 2
2 changes: 1 addition & 1 deletion fetchers/https.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ if [ $# -ne 3 ]; then
exit 1
fi

curl "https://$1/$2" > "$3" || exit 2
curl -s "https://$1/$2" > "$3" || exit 2
2 changes: 2 additions & 0 deletions lpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ fetchinfo() {
if [ -e "$LPKGDIR/db/$1/pkginfo.sh" -a -z "$UPDATE" ]; then
cp "$LPKGDIR/db/$1/pkginfo.sh" "$tmpdir/$1.pkginfo" || return $?
else
echo "Fetching info for $1"
fetch "$REPO" "pkgs/$1.pkginfo" "$tmpdir/$1.pkginfo" || return $?
fetch "$REPO" "pkgs/$1.pkginfo.minisig" "$tmpdir/$1.pkginfo.minisig" || return $?
minisign -Vm "$tmpdir/$1.pkginfo" -p "$LPKGDIR/pubkey.pub" || return 4
Expand Down Expand Up @@ -85,6 +86,7 @@ fetchpkg() {
echo "No hash in pkginfo!" >&2
return 4
fi
echo "Downloading $1"
fetch "$REPO" "pkgs/$1.tar.gz" "$tmpdir/$1.tar.gz" || return $?
if [ "$hash" != "$(sha256sum "$tmpdir/$1.tar.gz" | awk '{print $1}')" ]; then
echo "SHA256 hash does not match on $1.tar.gz!" >&2
Expand Down

0 comments on commit 977491f

Please sign in to comment.