ston1th/openup
1
0
Fork 0
forked from mirrors/openup
Code Releases Activity

revert to previous

Browse source
This commit is contained in:
Robert Nagy 2015-10-15 16:42:17 +02:00
commit 223fd1cbd4
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
openup
View file

@ -43,7 +43,7 @@ PKG_PATH_UPDATE="https://stable.mtier.org/updates/$(uname -r)/$(arch -s)"
VUXML_URL="https://stable.mtier.org/vuxml/$(uname -r | tr -d '.').xml" VUXML_URL="https://stable.mtier.org/vuxml/$(uname -r | tr -d '.').xml"
# fetch command (must behave like "ftp -o"); e.g. "wget -qO" # fetch command (must behave like "ftp -o"); e.g. "wget -qO"
FETCH="ftp -MVo" FETCH="ftp -Vo"
# exclusion list: pkg names without version/flavor, separated by space # exclusion list: pkg names without version/flavor, separated by space
EXCLUDE_PKG="" EXCLUDE_PKG=""
@ -164,7 +164,8 @@ update_pkg() {
check_vuxml() { check_vuxml() {
local _BP_MATCH _OUTDATED _PKG_MATCH _b _e _p local _BP_MATCH _OUTDATED _PKG_MATCH _b _e _p
${FETCH} ${_TMPVUXML} ${VUXML_URL} || bye_bye # XXX5.6 drop redirect to /dev/null when 5.6 is out of support
${FETCH} ${_TMPVUXML} ${VUXML_URL} >/dev/null || bye_bye
perl -pi -e 's,\$ARCH,'"${_ARCH}"',g' ${_TMPVUXML} perl -pi -e 's,\$ARCH,'"${_ARCH}"',g' ${_TMPVUXML}
_BP_MATCH="$(grep binpatch ${_TMPVUXML} | sed -e 's,<name>,,g;s,</name>,,g;s,\$ARCH,'"${_ARCH}"',g' | sort -u)" _BP_MATCH="$(grep binpatch ${_TMPVUXML} | sed -e 's,<name>,,g;s,</name>,,g;s,\$ARCH,'"${_ARCH}"',g' | sort -u)"
@ -232,8 +233,8 @@ fi
# regex taken from fw_update(1) # regex taken from fw_update(1)
set -A _REL -- $(sysctl -n kern.version | sed 's/^OpenBSD \([0-9]\.[0-9]\)\([^ ]*\).*/\1 \2/;q') set -A _REL -- $(sysctl -n kern.version | sed 's/^OpenBSD \([0-9]\.[0-9]\)\([^ ]*\).*/\1 \2/;q')
_REL_INT="$(echo ${_REL[0]} | tr -d '.')" _REL_INT="$(echo ${_REL[0]} | tr -d '.')"
_OPENUP_MINREL=57 _OPENUP_MINREL=56
_OPENUP_VERSION=20 _OPENUP_VERSION=19
if [ -n "${_REL[1]}" -a "${_REL[1]}" != "-stable" ]; then _badrel=1; fi if [ -n "${_REL[1]}" -a "${_REL[1]}" != "-stable" ]; then _badrel=1; fi
if [ "${_REL_INT}" -lt "${_OPENUP_MINREL}" ]; then _badrel=1; fi if [ "${_REL_INT}" -lt "${_OPENUP_MINREL}" ]; then _badrel=1; fi
if [ -n "${_badrel}" ]; then if [ -n "${_badrel}" ]; then
@ -241,6 +242,11 @@ if [ -n "${_badrel}" ]; then
exit 1 exit 1
fi fi
# XXX5.6 drop when 5.6 is out of support
if [ "${_REL_INT}" -ge 57 ]; then
FETCH="ftp -MVo"
fi
while getopts 'KSc' arg; do while getopts 'KSc' arg; do
case ${arg} in case ${arg} in
K) nokrn=1 ;; K) nokrn=1 ;;