Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin/osx/gen_sym_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

if len(sys.argv) < 4:
print("Usage:")
print("\tgen_sym_files.py <path to breakpad's dump_syms> <path to owncloud.app> <symbol output dir>")
print("\tgen_sym_files.py <path to breakpad's dump_syms> <path to ownCloud.app> <symbol output dir>")
print("")
print("Symbols will be created in './symbols'")
sys.exit(1)
Expand Down
2 changes: 1 addition & 1 deletion admin/osx/macosx.pkgproj.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>@APPLICATION_EXECUTABLE@.app</string>
<string>@APPLICATION_NAME@.app</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>
Expand Down
2 changes: 1 addition & 1 deletion admin/osx/post_install.sh.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion admin/osx/pre_install.sh.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}')
Expand Down