Dark-Alex-17/macos-virtualbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test "[[" doesn't require .* before regex, unlike "match"

Browse Source
This commit is contained in:
My Spaghetti
2020-08-14 11:16:55 +03:00
parent da2c6f8512
commit e44e8a32ce
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
macos-guest-virtualbox.sh
+5 -6
View File
@@ -390,7 +390,7 @@ fi
VBoxManage controlvm "${vm_name}" poweroff 2>/dev/null VBoxManage controlvm "${vm_name}" poweroff 2>/dev/null
echo -e "\nChecking that VirtualBox uses hardware-supported virtualization." echo -e "\nChecking that VirtualBox uses hardware-supported virtualization."
vbox_log="$(VBoxManage showvminfo "${vm_name}" --log 0)" vbox_log="$(VBoxManage showvminfo "${vm_name}" --log 0)"
regex='.*Attempting fall back to NEM.*' # for zsh regex compatibility regex='Attempting fall back to NEM' # for zsh regex compatibility
if [[ "${vbox_log}" =~ ${regex} ]]; then if [[ "${vbox_log}" =~ ${regex} ]]; then
echo -e "\nVirtualbox is not using hardware-supported virtualization features." echo -e "\nVirtualbox is not using hardware-supported virtualization features."
if [[ -n "$(cygcheck -V 2>/dev/null)" || if [[ -n "$(cygcheck -V 2>/dev/null)" ||
@@ -437,7 +437,7 @@ for catalog in "${macOS_release_name}_sucatalog_"* "error"; do
wget "${urlbase}InstallAssistantAuto.smd" \ wget "${urlbase}InstallAssistantAuto.smd" \
${wgetargs} \ ${wgetargs} \
--output-document="${catalog}_InstallAssistantAuto.smd" --output-document="${catalog}_InstallAssistantAuto.smd"
if [[ "$(cat "${catalog}_InstallAssistantAuto.smd" )" =~ .*Beta.* ]]; then if [[ "$(cat "${catalog}_InstallAssistantAuto.smd" )" =~ Beta ]]; then
continue continue
fi fi
found_version="$(head -n 6 "${catalog}_InstallAssistantAuto.smd" | tail -n 1)" found_version="$(head -n 6 "${catalog}_InstallAssistantAuto.smd" | tail -n 1)"
@@ -1525,12 +1525,11 @@ function prompt_lang_utils_terminal() {
function animated_please_wait() { function animated_please_wait() {
# "Please wait" prompt with animated dots. # "Please wait" prompt with animated dots.
# Requires one positional parameter, an integer # Accepts one optional positional parameter, an integer
# The parameter specifies how many half-seconds to wait # The parameter specifies how many half-seconds to wait
echo -ne "${low_contrast_color}Please wait${default_color}" echo -ne "${low_contrast_color}Please wait${default_color}"
specified_halfseconds="${1}" specified_halfseconds=5
[[ "${specified_halfseconds}" =~ [^0-9] [[ "${1}" =~ [^0-9] || -z "${1}" ]] || specified_halfseconds=${1}
|| -z "${specified_halfseconds}" ]] && specified_halfseconds=2
for halfsecond in $(seq 1 ${specified_halfseconds}); do for halfsecond in $(seq 1 ${specified_halfseconds}); do
echo -ne "${low_contrast_color}.${default_color}" echo -ne "${low_contrast_color}.${default_color}"
sleep 0.5 sleep 0.5