Index: branches/5.2.x/tools/synchronize.sh =================================================================== diff -u -N -r15660 -r16757 --- branches/5.2.x/tools/synchronize.sh (.../synchronize.sh) (revision 15660) +++ branches/5.2.x/tools/synchronize.sh (.../synchronize.sh) (revision 16757) @@ -1,4 +1,7 @@ #!/bin/sh MAPPED_PATH=`dirname $0` +PROJECT_ROOT_PATH=`dirname ${MAPPED_PATH}` -open $MAPPED_PATH/../system/export/Custom.textcomparison +if [[ "$OSTYPE" == "darwin"* ]]; then + osascript ${MAPPED_PATH}/araxis_merge.scpt "${PROJECT_ROOT_PATH}/system/export/Custom.lang" "${PROJECT_ROOT_PATH}/modules/custom/install/english.lang" +fi