diff --git a/steps/helpers.sh b/steps/helpers.sh index 9b6a59f8..9686c4cd 100755 --- a/steps/helpers.sh +++ b/steps/helpers.sh @@ -329,6 +329,7 @@ extract_file() { # Default unpacking function that unpacks all sources. default_src_unpack() { + local first_line found # Handle the first one differently first_line=$(head -n 1 ../sources) # Again, we want to split out into words. @@ -339,10 +340,14 @@ default_src_unpack() { if ! [ -e "${dirname}" ]; then for i in *; do if [ -d "${i}" ]; then + found="yes" dirname="${i}" break fi done + if [ -z "${found}" ]; then + dirname="." + fi fi # shellcheck disable=SC2162 tail -n +2 ../sources | while read line; do diff --git a/steps/manifest b/steps/manifest index 88089868..8d17ed3c 100644 --- a/steps/manifest +++ b/steps/manifest @@ -208,3 +208,4 @@ build: libxslt-1.1.38 build: docbook-xml-4.5 build: docbook-xsl-nons-1.79.2 improve: populate_catalog +build: wget-curl-1.0 diff --git a/steps/wget-curl-1.0/pass1.sh b/steps/wget-curl-1.0/pass1.sh new file mode 100644 index 00000000..796391df --- /dev/null +++ b/steps/wget-curl-1.0/pass1.sh @@ -0,0 +1,7 @@ +src_compile() { + : +} + +src_install() { + install -m 755 -D wget "${DESTDIR}/usr/bin/wget" +} diff --git a/steps/wget-curl-1.0/sources b/steps/wget-curl-1.0/sources new file mode 100644 index 00000000..7c714857 --- /dev/null +++ b/steps/wget-curl-1.0/sources @@ -0,0 +1 @@ +https://github.com/somasis/wget-curl/raw/c7469018de80788ce255502b1a05700ad0d71446/wget fadbfe776526a1f2aa530a2bcf1f279c6feb49b0663e87842833c76409889d9b