Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

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,

Code Block
languagebash
 #!/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


# notSet working in .sh yet need to run at commend line


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 /Volumes/svradm@bonsaiframework.com/opt/confluence/"$CURRENT_DIR"bin/setenv.sh /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/"$NEW_DIR"bin/setenv.sh
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/"$CURRENT_DIR"conf/server.xml /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/"$NEW_DIR"conf/server.xml
compare /Volumes/svradm@bonsaiframework.com/opt/"$CURRENT_DIR"confluence/confluence/WEB-INF/classes/confluence-init.properties /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/confluence/"$NEW_DIR"confluence/WEB-INF/classes/confluence-init.properties
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/"$CURRENT_DIR"bin/shutdown.sh /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/"$NEW_DIR"bin/shutdown.sh
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/"$CURRENT_DIR"bin/startup.sh /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/"$NEW_DIR"bin/startup.sh
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/"$CURRENT_DIR"bin/user.sh /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/"$NEW_DIR"bin/user.sh
 
 
# extra security changes
compare /Volumes/svradm@bonsaiframework.com/opt/"$CURRENT_DIR"confluence/confluence/WEB-INF/classes/log4j.properties /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/confluence/"$NEW_DIR"confluence/WEB-INF/classes/log4j.properties
  
 
compare /Volumes/svradm@bonsaiframework.com/opt/"$CURRENT_DIR"confluence/confluence/WEB-INF/web.xml /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/confluence/"$NEW_DIR"confluence/WEB-INF/web.xml
compare /Volumes/svradm@bonsaiframework.com/opt/"$CURRENT_DIR"confluence/WEB-INF/classes/log4j.properties /Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3"$NEW_DIR"confluence/WEB-INF/classes/log4j.properties