diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-04-06 15:33:23 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-04-06 15:33:23 +0300 |
| commit | 7578cae40b20664fe8678183ecb0ce4f53240325 (patch) | |
| tree | b124acbac3417c232a47c24b1a7b74b57fed4deb /admin | |
| parent | 90abea7b109e2f111459c022338d0983e53d1ff9 (diff) | |
| parent | 096c4ff35417139c1870daca9171fbfba74d0158 (diff) | |
Merge remote-tracking branch 'origin/2.6'
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/osx/post_install.sh.cmake | 8 | ||||
| -rw-r--r-- | admin/osx/pre_install.sh.cmake | 12 |
2 files changed, 17 insertions, 3 deletions
diff --git a/admin/osx/post_install.sh.cmake b/admin/osx/post_install.sh.cmake index dbc14eb53..650400783 100644 --- a/admin/osx/post_install.sh.cmake +++ b/admin/osx/post_install.sh.cmake @@ -1,5 +1,11 @@ #!/bin/bash +## log stdout stderr and set -x to a file +# exec > ~/@APPLICATION_EXECUTABLE@-post-install.log +# exec 2>&1 +# BASH_XTRACEFD=1 +# set -x + LOGGED_IN_USER_ID=$(id -u "${USER}") # Always enable the new 10.10 finder plugin if available @@ -9,7 +15,7 @@ if [[ -x "$(command -v pluginkit)" ]]; then # Since El Capitan we need to sleep #4650 sleep 10s # enable it - pluginkit -e use -i @APPLICATION_REV_DOMAIN@.FinderSyncExt + pluginkit -e use -i "@APPLICATION_REV_DOMAIN@.FinderSyncExt" fi if [[ -f "${INSTALLER_TEMP}/OC_RESTART_NEEDED" ]]; then diff --git a/admin/osx/pre_install.sh.cmake b/admin/osx/pre_install.sh.cmake index 51809adc4..27b19c7eb 100644 --- a/admin/osx/pre_install.sh.cmake +++ b/admin/osx/pre_install.sh.cmake @@ -1,9 +1,17 @@ #!/bin/bash -OC_INSTANCE=$(ps aux | grep "/Applications/@APPLICATION_EXECUTABLE@.app/Contents/MacOS/@APPLICATION_EXECUTABLE@") +## log stdout stderr and set -x to a file +# exec > "~/@APPLICATION_EXECUTABLE@-pre-install.log" +# exec 2>&1 +# BASH_XTRACEFD=1 +# set -x + +# don't grep in one line, to avaoid grepping the grep process... +PROCESSES=$(ps aux) +OC_INSTANCE=$(echo "${PROCESSES}" | grep "/Applications/@APPLICATION_EXECUTABLE@.app/Contents/MacOS/@APPLICATION_EXECUTABLE@") if [[ "${OC_INSTANCE}" != "" ]]; then - kill $(echo ${OC_INSTANCE} | awk '{print $2}') + kill $(echo "${OC_INSTANCE}" | awk '{print $2}') touch $INSTALLER_TEMP/OC_RESTART_NEEDED fi |