Page tree
Skip to end of metadata
Go to start of metadata

You are viewing an old version of this page. View the current version.

Compare with Current View Page History

« Previous Version 5 Current »

Intro goes here...

Mac OS X

From this you can also build a Windows version.

This is not yet working via bash script yet so you have to run by direct command line,

 #!/bin/sh
export PATH=$PATH:/Applications/Araxis\ Merge.app/Contents/Utilities

# Confirm that the path export worked.
which compare
# Result should be this,
# /Applications/Araxis Merge.app/Contents/Utilities/compare

# Set variables.
CURRENT_DIR=/Volumes/svradm@bonsaiframework.com/opt/confluence/
NEW_DIR=/Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/


# Improvements to do...
# Change the path to environment variables.
# Make it run in a bash shell.
# core Confluence changes

# Loads Araxis with original on the left and new one on the right.
# base
compare "$CURRENT_DIR"bin/setenv.sh "$NEW_DIR"bin/setenv.sh
compare "$CURRENT_DIR"conf/server.xml "$NEW_DIR"conf/server.xml
compare "$CURRENT_DIR"confluence/WEB-INF/classes/confluence-init.properties "$NEW_DIR"confluence/WEB-INF/classes/confluence-init.properties
compare "$CURRENT_DIR"bin/shutdown.sh "$NEW_DIR"bin/shutdown.sh
compare "$CURRENT_DIR"bin/startup.sh "$NEW_DIR"bin/startup.sh
compare "$CURRENT_DIR"bin/user.sh "$NEW_DIR"bin/user.sh
 
 
# extra security changes
compare "$CURRENT_DIR"confluence/WEB-INF/classes/log4j.properties "$NEW_DIR"confluence/WEB-INF/classes/log4j.properties
 
 
compare "$CURRENT_DIR"confluence/WEB-INF/web.xml "$NEW_DIR"confluence/WEB-INF/web.xml
compare "$CURRENT_DIR"confluence/WEB-INF/classes/log4j.properties "$NEW_DIR"confluence/WEB-INF/classes/log4j.properties
  • No labels