summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmpfile <tmpfile@users.noreply.github.com>2017-07-15 11:48:30 -0300
committerNatanael Copa <ncopa@alpinelinux.org>2017-09-19 12:02:57 +0000
commit56b8d45079f3a3f1555e0df8a5bbc481b3583b7c (patch)
tree4084031048aa0814ba007ed5dce025dfcaeed563
parent71157f9cdcc76af7ea0f7484bb77e636f10455bb (diff)
downloadabuild-56b8d45079f3a3f1555e0df8a5bbc481b3583b7c.tar.gz
abuild-56b8d45079f3a3f1555e0df8a5bbc481b3583b7c.tar.bz2
abuild-56b8d45079f3a3f1555e0df8a5bbc481b3583b7c.tar.xz
abuild-56b8d45079f3a3f1555e0df8a5bbc481b3583b7c.zip
abuild.in: remove saveas- syntax and fix sourcecheck()v3.0.1
As discussed in alpinelinux/aports#1438 saveas- was removed from abuild-fetch.c with https://github.com/alpinelinux/abuild/pull/20 but abuild.in slipped. Also fixes a wget -s instance that's not supported by recent busybox (-s was changed for --spider). /cc @kaniini
-rw-r--r--abuild.in8
1 files changed, 2 insertions, 6 deletions
diff --git a/abuild.in b/abuild.in
index 7f31dbe..dae99b3 100644
--- a/abuild.in
+++ b/abuild.in
@@ -296,15 +296,11 @@ sourcecheck() {
for uri in $source; do
is_remote $uri || continue
case "$uri" in
- saveas-*://*)
- uri=${uri#saveas-}
- uri=${uri%/*}
- ;;
*::*)
uri=${uri##*::}
;;
esac
- wget -q -s "$uri" || return 1
+ wget --spider -q "$uri" || return 1
done
return 0
}
@@ -318,7 +314,7 @@ uri_fetch() {
is_remote() {
case "${1#*::}" in
- http://*|ftp://*|https://*|saveas-*://*)
+ http://*|ftp://*|https://*)
return 0;;
esac
return 1