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


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

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


#
# Backup the files first.
#

# Core files.
cp "$NEW_DIR"bin/setenv.sh "$NEW_DIR"bin/setenv.sh.ori
cp "$NEW_DIR"conf/server.xml "$NEW_DIR"conf/server.xml.ori
cp "$NEW_DIR"confluence/WEB-INF/classes/confluence-init.properties "$NEW_DIR"confluence/WEB-INF/classes/confluence-init.properties.ori
cp "$NEW_DIR"bin/shutdown.sh "$NEW_DIR"bin/shutdown.sh.ori
cp "$NEW_DIR"bin/startup.sh "$NEW_DIR"bin/startup.sh.ori
cp "$NEW_DIR"bin/user.sh "$NEW_DIR"bin/user.sh.ori

# Extra Security Changes
cp "$NEW_DIR"confluence/WEB-INF/web.xml "$NEW_DIR"confluence/WEB-INF/web.xml.ori
cp "$NEW_DIR"confluence/WEB-INF/classes/log4j.properties "$NEW_DIR"confluence/WEB-INF/classes/log4j.properties.ori

#
# Diff in Araxis with original on the left and new one on the right.
#
base
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/# Core files.
compare "$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



# extraExtra security changes
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/confluence/WEB-INF/classes/log4j.properties
/Volumes/svradm@bonsaiframework.com/opt/atlassian-confluence-5.5.3/confluence/WEB-INF/classes/log4j.properties

 
compare /Volumes/svradm@bonsaiframework.com/opt/confluence/confluence/compare "$CURRENT_DIR"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