head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.50 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.48 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.46 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.44 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.42 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.40 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.38 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.36 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.34 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.32 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.30 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.28 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.26 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.24 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.22 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.20 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.18 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.16 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.14 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.12 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.10 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.8 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.6 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.4 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.2 pkgsrc-2020Q1-base:1.1; locks; strict; comment @# @; 1.1 date 2019.12.29.22.09.38; author ng0; state Exp; branches; next ; commitid hXqzbkoLVSs8rEQB; desc @@ 1.1 log @net/wgetpaste: Update to 2.29 No Changelog. @ text @$NetBSD$ upstream commit 6175f89cb618fef83882ed86ab049a7fd1035770 Fix handling of bpaste urls. bpaste is the default service. --- wgetpaste~ +++ wgetpaste @@@@ -181,7 +181,8 @@@@ xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb xml+velocity xml xquery xslt xtend yaml" EXPIRATIONS_pinnwand="1day 1week 1month never" POST_pinnwand="submit=Paste! % % lexer expiry % code" -REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|' +REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1" +REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|' ### errors die() { @@@@ -550,11 +551,15 @@@@ postdata() { # get url from response from server geturl() { - local regex + local regex location regex=REGEX_URL_$ENGINE + location=REGEX_LOC_$ENGINE if [[ -n ${!regex} ]]; then [[ needstdout = $1 ]] && return 0 sed -n -e "${!regex}" <<< "$*" + elif [[ -n ${!location} ]]; then + [[ needstdout = $1 ]] && return 1 + sed -n -e "s|^.*Location: ${!location}|p" <<< "$*" else [[ needstdout = $1 ]] && return 1 sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*" @