Skip to content

Commit ecb429c

Browse files
committed
source: Fix release candidate tarball URLs.
Remove temporary workaround for misnamed release candidate tarballs that is no longer needed (and moreover, doesn't work now). The underlying issue was resolved in asterisk/asterisk-ci-actions@007433e
1 parent d8dcd8f commit ecb429c

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

phreaknet.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,7 @@ AST_NEXT_MAJOR_VER=22
195195
AST_MAJOR_VER=$AST_DEFAULT_MAJOR_VER
196196
AST_MM_VER=0
197197
AST_SOURCE_NAME="asterisk-${AST_DEFAULT_MAJOR_VER}-current"
198-
# This was meant to be -testing, but ended up being -testing-rc#,
199-
# if this is fixed, this will need to be adjusted accordingly.
200-
AST_RC_SOURCE_NAME="asterisk-${AST_DEFAULT_MAJOR_VER}-testing-rc1"
201-
AST_RC_SOURCE_NAME2="asterisk-${AST_DEFAULT_MAJOR_VER}-testing-rc2"
198+
AST_RC_SOURCE_NAME="asterisk-${AST_DEFAULT_MAJOR_VER}-testing"
202199

203200
# DAHDI_MM_VER="${DAHDI_VERSION:0:1}${DAHDI_VERSION:2:1}" Requires bash
204201
DAHDI_MM_VER=34
@@ -2418,15 +2415,8 @@ get_source() {
24182415
if [ "$AST_ALT_VER" = "" ]; then # download latest bundled version
24192416
if [ "$PREFER_RELEASE_CANDIDATES" = "1" ]; then
24202417
# Delete any previous release candidates
2421-
rm -f $AST_RC_SOURCE_NAME.tar.gz $AST_RC_SOURCE_NAME2.tar.gz # the name itself doesn't guarantee that the version is the same
2418+
rm -f $AST_RC_SOURCE_NAME.tar.gz # the name itself doesn't guarantee that the version is the same
24222419
$WGET https://downloads.asterisk.org/pub/telephony/asterisk/$AST_RC_SOURCE_NAME.tar.gz
2423-
if [ ! -f $AST_RC_SOURCE_NAME.tar.gz ]; then
2424-
# XXX This is a workaround for the -testing tarballs including the rc name (which wasn't the intent)
2425-
# Look for a 2nd RC if there is one.
2426-
# Very rarely there may be a 3rd one, and this is not yet handled here.
2427-
AST_RC_SOURCE_NAME="$AST_RC_SOURCE_NAME2"
2428-
$WGET https://downloads.asterisk.org/pub/telephony/asterisk/$AST_RC_SOURCE_NAME.tar.gz
2429-
fi
24302420
if [ ! -f $AST_RC_SOURCE_NAME.tar.gz ]; then
24312421
printf "No release candidate is currently available, installing latest stable version instead\n"
24322422
PREFER_RELEASE_CANDIDATES=0

0 commit comments

Comments
 (0)