summarylogtreecommitdiffstats
path: root/common-functions.sh
diff options
context:
space:
mode:
authorDet2015-08-26 20:14:20 +0300
committerDet2015-08-26 20:14:20 +0300
commitd27a3c4fce49afe7adab22509e178b3280981d0e (patch)
tree82654e3467d2645ca9db8a05f55135032258e7c1 /common-functions.sh
parent2ef714c6ca3bb0147360540878cc65eb39129525 (diff)
downloadaur-d27a3c4fce49afe7adab22509e178b3280981d0e.tar.gz
Upgpkg: 12.0.0
Diffstat (limited to 'common-functions.sh')
-rw-r--r--[-rwxr-xr-x]common-functions.sh22
1 files changed, 19 insertions, 3 deletions
diff --git a/common-functions.sh b/common-functions.sh
index 37d9102c3a2..81c05875e35 100755..100644
--- a/common-functions.sh
+++ b/common-functions.sh
@@ -72,9 +72,19 @@ vmware_check() {
set_product_name() {
ver=$(vmware-installer -l |& grep -Po "(player|workstation) *\K(\d+\.){2}\d+")
if vmware-installer -l |& grep -q "workstation"; then
- name="VMware Workstation"
+ if [[ $ver = 12.* ]]; then
+ name="VMware Workstation Pro"
+ else
+ name="VMware Workstation"
+ fi
else
- name="VMware Player (Plus)"
+ if [[ $ver = 12.* ]]; then
+ name="VMware Workstation Player"
+ elif [[ $ver = 7.* ]]; then
+ name="VMware Player (Pro)"
+ else
+ name="VMware Player (Plus)"
+ fi
fi
}
@@ -156,7 +166,13 @@ patch_sources() {
# Print vmware-modconfig-*.logs and exit
print_logs() {
- for log in /tmp/vmware-root/vmware-modconfig-*.log; do
+ if [[ $ver = 12.* ]]; then
+ logs=(/tmp/vmware-root/vmware-[0-9]*.log)
+ else
+ logs=(/tmp/vmware-root/vmware-modconfig*.log)
+ fi
+
+ for log in ${logs[@]}; do
error2 "$log"
done
exit 1