Ori.livneh has submitted this change and it was merged. Change subject: Ensure /etc/virtualbox-version exists before trying to read it ......................................................................
Ensure /etc/virtualbox-version exists before trying to read it Change-Id: I8b7d1bfb6a875916d9e7462b70f43b05bb1bf353 --- M puppet/modules/misc/files/update-guest-additions 1 file changed, 18 insertions(+), 5 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/puppet/modules/misc/files/update-guest-additions b/puppet/modules/misc/files/update-guest-additions index 6bb8e17..7ce7cd2 100755 --- a/puppet/modules/misc/files/update-guest-additions +++ b/puppet/modules/misc/files/update-guest-additions @@ -1,9 +1,10 @@ #!/usr/bin/env bash - -VIRTUALBOX_VERSION="$(</etc/virtualbox-version)" -BASE_URL="http://download.virtualbox.org/virtualbox/${VIRTUALBOX_VERSION}"; -GUEST_ADDITIONS_ISO="VBoxGuestAdditions_${VIRTUALBOX_VERSION}.iso" -GUEST_ADDITIONS_VERSION="$(modinfo -Fversion vboxguest)" +# +# VirtualBox Guest Additions Upgrade Helper +# ----------------------------------------- +# Reads host's VirtualBox version from /etc/virtualbox-version, +# which is generated by Puppet. +# warn () { printf "$(tput setaf 1)%s$(tput sgr0)\n" "$1" >&2 @@ -13,11 +14,23 @@ printf "$(tput setaf 4)%s$(tput sgr0)\n" "$1" } +[[ ! -r "/etc/virtualbox-version" ]] && { + warn 'Cannot determine host VirtualBox version.' + exit 1 +} + +# Re-run under 'sudo' if not invoked with 'sudo'. + [[ ! $SUDO_COMMAND ]] && { sudo $0 exit $? } +VIRTUALBOX_VERSION="$(</etc/virtualbox-version)" +BASE_URL="http://download.virtualbox.org/virtualbox/${VIRTUALBOX_VERSION}"; +GUEST_ADDITIONS_ISO="VBoxGuestAdditions_${VIRTUALBOX_VERSION}.iso" +GUEST_ADDITIONS_VERSION="$(modinfo -Fversion vboxguest)" + # Check if Guest additions need to be updated. [[ ! $VIRTUALBOX_VERSION ]] && { -- To view, visit https://gerrit.wikimedia.org/r/57824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b7d1bfb6a875916d9e7462b70f43b05bb1bf353 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
