diff --git a/openup b/openup
index 0bdb1ee..6163827 100755
--- a/openup
+++ b/openup
@@ -75,6 +75,7 @@ if [ -n "${_BPLIST}" ]; then
fi
unset _BPLIST
+_ARCH=$(arch -s)
_TMPDIR="${TMPDIR:=/tmp}"
_TMPCERT=$(mktemp -p ${_TMPDIR} .openup-pkg_cert.XXXXXXXXXX) || exit 1
_TMPSPLITCERT=$(mktemp -p ${_TMPDIR} .openup-split_cert.XXXXXXXXXX) || exit 1
@@ -144,11 +145,11 @@ check_openupd() {
update_binpatches() {
local _BP _CMD
- _BP=$(pkg_info -Q binpatch${_REL_INT}-$(arch -s) | sed 's/.[^-]*$//' | sort -u | tr '\n' ' ')
+ _BP=$(pkg_info -Q binpatch${_REL_INT}-${_ARCH} | sed 's/.[^-]*$//' | sort -u | tr '\n' ' ')
if [ -n "${_BP}" ]; then
if [ -n "${exclude_kernel}" ]; then
- _BP=$(echo ${_BP} | sed -e "s,binpatch${_REL_INT}-$(arch -s)-kernel,,g")
+ _BP=$(echo ${_BP} | sed -e "s,binpatch${_REL_INT}-${_ARCH}-kernel,,g")
fi
pr_bigarrow "Updating binpatch(es)"
_CMD="pkg_add ${pkg_opt} ${_BP}"
@@ -161,7 +162,7 @@ update_pkg() {
local _CMD _PKG
_PKG=$(pkg_info -q | perl -ne '/^(.*)-(\d[^-]*)[-]?(\w*)(.*)$/ && print "$1\n"' | \
- grep -v binpatch${_REL_INT}-$(arch -s))
+ grep -v binpatch${_REL_INT}-${_ARCH})
if [ -n "${_PKG}" ]; then
pr_bigarrow "Updating package(s)"
@@ -178,12 +179,12 @@ check_vuxml() {
local _BP_MATCH _OUTDATED _PAT _PKG_MATCH
ftp -Vo ${_TMPVUXML} ${VUXML_URL} >/dev/null
- perl -pi -e 's,\$ARCH,'"$(arch -s)"',g' ${_TMPVUXML}
+ perl -pi -e 's,\$ARCH,'"${_ARCH}"',g' ${_TMPVUXML}
- _BP_MATCH="$(grep binpatch ${_TMPVUXML} | sed -e 's,,,g;s,,,g;s,\$ARCH,'"$(arch -s)"',g' | sort -u)"
+ _BP_MATCH="$(grep binpatch ${_TMPVUXML} | sed -e 's,,,g;s,,,g;s,\$ARCH,'"${_ARCH}"',g' | sort -u)"
_PAT=$(pkg_info -q | perl -ne '/^(.*)-(\d[^-]*)[-]?(\w*)(.*)$/ && print "$1\n"' | \
- grep -v binpatch${_REL_INT}-$(arch -s) | \
+ grep -v binpatch${_REL_INT}-${_ARCH} | \
while read l; do echo -n "|$l"; done | \
sed 's/^|//' | sed -e 's,++,\\\++,g')
_PKG_MATCH=$(grep -Eo '('"${_PAT}"')' ${_TMPVUXML} | \