Changeset 85100 in vbox for trunk/src/VBox/Installer/darwin/VirtualBox

Timestamp:

Jul 7, 2020 9:51:37 PM (5 years ago)

Author:

vboxsync

Message:

Installer/darwin: bugref:9771 Improve error handling when installing vboxwebsrv plist file

File:

• trunk/src/VBox/Installer/darwin/VirtualBox/postflight (modified) (3 diffs)

trunk/src/VBox/Installer/darwin/VirtualBox/postflight

@@ -17 +17 @@
 #
 
-CP="/bin/cp -f"
-CPDIR="${CP} -R"
+CPDIR="/bin/cp -f -R"
+INSTALL=/usr/bin/install
 
 
@@ -44 +44 @@
 VBOXWEBSRV="${VBOX_INSTALL_PATH}/org.virtualbox.vboxwebsrv.plist"
 VBOXWEBSRV_TRG="${HOME}/Library/LaunchAgents"
-if [[ -e "${VBOXWEBSRV}" && -e "${VBOXWEBSRV_TRG}" ]]; then
+if [ -e "${VBOXWEBSRV}" -a -e "${VBOXWEBSRV_TRG}" ]; then
     echo "Installing vboxwebsrv launchd file to ${VBOXWEBSRV_TRG}"
-    ${CP} "${VBOXWEBSRV}" "${VBOXWEBSRV_TRG}/"
-    [ "x" != "x${USER}" ] && /usr/sbin/chown "${USER}" "${VBOXWEBSRV_TRG}/org.virtualbox.vboxwebsrv.plist"
+    if [ "x" != "x${USER}" ]; then
+        ${INSTALL} -S -o "${USER}" -m 0644 "${VBOXWEBSRV}" "${VBOXWEBSRV_TRG}/"
+    else
+        ${INSTALL} -S -m 0644 "${VBOXWEBSRV}" "${VBOXWEBSRV_TRG}/"
+    fi
 fi
 
@@ -63 +66 @@
 #
 LSREGISTER=/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister
-if [[ -e "${LSREGISTER}" && "x" != "x${USER}" ]]; then
+if [ -e "${LSREGISTER}" -a "x" != "x${USER}" ]; then
     echo "Register file extensions for \"${USER}\""
     /usr/bin/sudo -u "${USER}" ${LSREGISTER} -f /Applications/VirtualBox.app