mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-07 11:49:40 +00:00
Code Issues Releases Activity

Fix RANDOMIZE_MASTER_SITES.

Browse Source 
- /usr/games/random moved to /usr/bin/random in 11.0+
- Need to explicitly add in the pipe '|'

Approved by:	portmgr (implicit)
This commit is contained in:
Bryan Drewery 2018-02-20 22:58:19 +00:00
parent 9dfb7dbe4c
commit e5a42a8c3c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=462464
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mk/Scripts/do-fetch.sh
View File

@ -112,7 +112,12 @@ for _file in "${@}"; do
;;
esac
sites_remaining=0
sites="$(${SORTED_MASTER_SITES_CMD_TMP} ${dp_RANDOMIZE_SITES})"
if [ -n "${dp_RANDOMIZE_SITES}" ]; then
sites="$(${SORTED_MASTER_SITES_CMD_TMP} | ${dp_RANDOMIZE_SITES})"
else
sites="$(${SORTED_MASTER_SITES_CMD_TMP})"
fi
echo $sites >&2
for site in ${sites}; do
sites_remaining=$((sites_remaining + 1))
done

6
Mk/bsd.port.mk
View File

@ -2110,8 +2110,12 @@ FETCH_CMD?= ${FETCH_BINARY} ${FETCH_ARGS}
.if defined(RANDOMIZE_MASTER_SITES)
.if exists(/usr/games/random)
RANDOM_CMD?= /usr/games/random
.elif exists(/usr/bin/random)
RANDOM_CMD?= /usr/bin/random
.endif
.if defined(RANDOM_CMD) && !empty(RANDOM_CMD)
RANDOM_ARGS?= -w -f -
_RANDOMIZE_SITES= |${RANDOM_CMD} ${RANDOM_ARGS}
_RANDOMIZE_SITES= ${RANDOM_CMD} ${RANDOM_ARGS}
.endif
.endif