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

Redo the way we do dry runs to output the command that would have been run.

Browse source 
Simplify some stuffs while here.
Bump version.
This commit is contained in:
Antoine Jacoutot 2013-08-06 10:27:57 +02:00
commit 038da756dd
1 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

52
openup
View file

@ -28,7 +28,7 @@ PKG_CERT_REGEX='M:Tier Ltd. OpenBSD Stable Updates'
### end of user defined variables ### end of user defined variables
# do not change this!!! # do not change this!!!
OPENUP_VERSION=0 OPENUP_VERSION=1
OPENUP_MINREL=53 OPENUP_MINREL=53
error() { error() {
@ -52,7 +52,7 @@ check_unsup() {
} }
get_cert() { get_cert() {
local _CERT local _CERT _CMD
if [ -r /etc/ssl/pkgca.pem ]; then if [ -r /etc/ssl/pkgca.pem ]; then
openssl x509 -noout -in /etc/ssl/pkgca.pem -issuer 2>/dev/null | \ openssl x509 -noout -in /etc/ssl/pkgca.pem -issuer 2>/dev/null | \
@ -61,40 +61,58 @@ get_cert() {
echo "===> Downloading certificate" echo "===> Downloading certificate"
_CERT=$(mktemp -p ${TMPDIR:=/tmp} pkg_cert.XXXXXXXXXX) || exit 1 _CERT=$(mktemp -p ${TMPDIR:=/tmp} pkg_cert.XXXXXXXXXX) || exit 1
ftp -Vo ${_CERT} ${PKG_CERT_URL} _CMD="ftp -Vo ${_CERT} ${PKG_CERT_URL}"
if [ $? -ne 0 ]; then if [ -z "${DRYRUN}" ]; then
error "XXX could not download certificate; it's a no-no" ${_CMD}
rm -f ${_CERT} if [ $? -ne 0 ]; then
exit 1 error "XXX could not download certificate; it's a no-no"
rm -f ${_CERT}
exit 1
fi
else
echo "dry run mode: ${_CMD}"
fi fi
echo "===> Installing certificate" echo "===> Installing certificate"
[[ -z ${DRYRUN} ]] && cat ${_CERT} >>/etc/ssl/pkgca.pem _CMD="cat ${_CERT} >>/etc/ssl/pkgca.pem"
[ $? -eq 0 ] && echo "successfully added certificate to /etc/ssl/pkgca.pem" if [ -z "${DRYRUN}" ]; then
${_CMD}
if [ $? -eq 0 ]; then
echo "successfully installed certificate into /etc/ssl/pkgca.pem"
fi
else
echo "dry run mode: ${_CMD}"
fi
rm -f ${_CERT} rm -f ${_CERT}
} }
update_self() { update_self() {
local _F _N local _CMD _F _N
echo "===> Checking for openup(8) update" echo "===> Checking for openup(8) update"
_F=$(mktemp -p ${TMPDIR:=/tmp} pkg_cert.XXXXXXXXXX) || exit 1 _F=$(mktemp -p ${TMPDIR:=/tmp} pkg_cert.XXXXXXXXXX) || exit 1
ftp -Vo ${_F} ${OPENUP_URL} _CMD="ftp -Vo ${_F} ${OPENUP_URL}"
if [ $? -ne 0 ]; then if [ -z "${DRYRUN}" ]; then
error "XXX could not check for openup update; it's a no-no (non-fatal)" ${_CMD}
return 1 if [ $? -ne 0 ]; then
error "XXX could not check for openup update; it's a no-no (non-fatal)"
fi
else
echo "dry run mode: ${_CMD}"
echo "dry run mode: will not try to update itself"
fi fi
_N=$(grep -Eo '^OPENUP_VERSION=.*' ${_F} | awk -F '=' '{ print $2 }') _N=$(grep -Eo '^OPENUP_VERSION=.*' ${_F} | awk -F '=' '{ print $2 }')
[[ -n "${_N}" ]] && \ [[ -n "${_N}" ]] && \
if [ "${OPENUP_VERSION}" -lt "${_N}" ]; then if [ "${OPENUP_VERSION}" -lt "${_N}" ]; then
echo "===> Updating openup(8) from version ${OPENUP_VERSION} to version ${_N}" echo "===> Updating openup(8) from version ${OPENUP_VERSION} to version ${_N}"
[[ -z "${DRYRUN}" ]] && cat ${_F} >${MEESA} cat ${_F} >${MEESA}
[ $? -eq 0 ] && \ if [ $? -eq 0 ]; then
rm -f ${_F} rm -f ${_F}
echo "successfully updated openup(8) to version ${_N}, restarting myself" && \ echo "successfully updated openup(8) to version ${_N}, restarting myself"
${MEESA} -U $@ ${MEESA} -U $@
exit $? exit $?
fi
fi fi
rm -f ${_F} rm -f ${_F}
} }