diff --git a/admin/osx/gen_sym_files.py b/admin/osx/gen_sym_files.py index 3335492a1d1..98c64bbd9c4 100755 --- a/admin/osx/gen_sym_files.py +++ b/admin/osx/gen_sym_files.py @@ -6,7 +6,7 @@ if len(sys.argv) < 4: print("Usage:") - print("\tgen_sym_files.py ") + print("\tgen_sym_files.py ") print("") print("Symbols will be created in './symbols'") sys.exit(1) diff --git a/admin/osx/macosx.pkgproj.cmake b/admin/osx/macosx.pkgproj.cmake index 762df146e2d..ef4cc2262dc 100644 --- a/admin/osx/macosx.pkgproj.cmake +++ b/admin/osx/macosx.pkgproj.cmake @@ -26,7 +26,7 @@ GID 80 PATH - @APPLICATION_EXECUTABLE@.app + @APPLICATION_NAME@.app PATH_TYPE 3 PERMISSIONS diff --git a/admin/osx/post_install.sh.cmake b/admin/osx/post_install.sh.cmake index 8044ca29249..c05f7c7406b 100644 --- a/admin/osx/post_install.sh.cmake +++ b/admin/osx/post_install.sh.cmake @@ -11,7 +11,7 @@ LOGGED_IN_USER_ID=$(id -u "${USER}") # Always enable the new 10.10 finder plugin if available if [[ -x "$(command -v pluginkit)" ]]; then # add it to DB. This happens automatically too but we try to push it a bit harder for issue #3463 - pluginkit -a "/Applications/@APPLICATION_EXECUTABLE@.app/Contents/PlugIns/FinderSyncExt.appex/" + pluginkit -a "/Applications/@APPLICATION_NAME@.app/Contents/PlugIns/FinderSyncExt.appex/" # Since El Capitan we need to sleep #4650 sleep 10s # enable it diff --git a/admin/osx/pre_install.sh.cmake b/admin/osx/pre_install.sh.cmake index 27b19c7eba8..fe4f32e4323 100644 --- a/admin/osx/pre_install.sh.cmake +++ b/admin/osx/pre_install.sh.cmake @@ -8,7 +8,7 @@ # 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@") +OC_INSTANCE=$(echo "${PROCESSES}" | grep "/Applications/@APPLICATION_NAME@.app/Contents/MacOS/@APPLICATION_EXECUTABLE@") if [[ "${OC_INSTANCE}" != "" ]]; then kill $(echo "${OC_INSTANCE}" | awk '{print $2}')