eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 13:20:57 +00:00
Code Activity

Install target no longer overwrites env.sh - use designated refreshInstance.sh for this purpose

Browse Source
This commit is contained in:
Simon Pamies committed 2013-12-20 15:15:33 +01:00
1 parent a158fda762
commit 12f05b1285
1 file changed
+4 -12
Download Patch File Download Diff File Expand all files Collapse all files
configuration/buildAndUpdateProduct.sh
+4 -12
View File
@@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
set -o functrace set -o functrace
find_project_home () find_project_home ()
{ {
if [[ $1 == '/' ]] || [[ $1 == "" ]]; then if [[ $1 == '/' ]] || [[ $1 == "" ]]; then
@@ -104,7 +103,8 @@ if [ $# -eq 0 ]; then
echo "" echo ""
echo "build: builds the server code using Maven to $PROJECT_HOME (log to $START_DIR/build.log)" echo "build: builds the server code using Maven to $PROJECT_HOME (log to $START_DIR/build.log)"
echo "" echo ""
echo "install: installs product and configuration to $SERVERS_HOME/$active_branch. Overwrites any configuration by using config from branch." echo "install: installs product files to $SERVERS_HOME/$active_branch. Does NOT overwrite any configuration in env.sh! If you want to
echo " overwrite the configuration then use the refreshInstance.sh script that comes with the instance. ""
echo "" echo ""
echo "all: invokes build and then install" echo "all: invokes build and then install"
echo "" echo ""
@@ -553,9 +553,6 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
if [ ! -f "$ACDIR/env.sh" ]; then if [ ! -f "$ACDIR/env.sh" ]; then
cp -v $PROJECT_HOME/java/target/env.sh $ACDIR/ cp -v $PROJECT_HOME/java/target/env.sh $ACDIR/
fi
if [ ! -f $ACDIR/no-overwrite ]; then
cp -v $p2PluginRepository/configuration/config.ini configuration/ cp -v $p2PluginRepository/configuration/config.ini configuration/
mkdir -p configuration/jetty/etc mkdir -p configuration/jetty/etc
@@ -564,11 +561,8 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-deployer.xml configuration/jetty/etc cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-deployer.xml configuration/jetty/etc
cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/realm.properties configuration/jetty/etc cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/realm.properties configuration/jetty/etc
cp -v $PROJECT_HOME/java/target/configuration/monitoring.properties configuration/ cp -v $PROJECT_HOME/java/target/configuration/monitoring.properties configuration/
cp -v $PROJECT_HOME/configuration/mongodb.cfg $ACDIR/
cp -v $PROJECT_HOME/java/target/env.sh $ACDIR/
cp -v $PROJECT_HOME/java/target/udpmirror $ACDIR/ cp -v $PROJECT_HOME/java/target/udpmirror $ACDIR/
cp -v $PROJECT_HOME/java/target/http2udpmirror $ACDIR cp -v $PROJECT_HOME/java/target/http2udpmirror $ACDIR
cp -v $PROJECT_HOME/java/target/configuration/logging.properties $ACDIR/configuration cp -v $PROJECT_HOME/java/target/configuration/logging.properties $ACDIR/configuration
fi fi
@@ -581,7 +575,7 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
# Make sure this script is up2date at least for the next run # Make sure this script is up2date at least for the next run
cp -v $PROJECT_HOME/configuration/buildAndUpdateProduct.sh $ACDIR/ cp -v $PROJECT_HOME/configuration/buildAndUpdateProduct.sh $ACDIR/
# make sure to save the information from env.sh # make sure to read the information from env.sh
. $ACDIR/env.sh . $ACDIR/env.sh
echo "$VERSION_INFO System:" > $ACDIR/configuration/jetty/version.txt echo "$VERSION_INFO System:" > $ACDIR/configuration/jetty/version.txt
@@ -612,9 +606,7 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
echo "REPLICATION_CHANNEL: $REPLICATION_CHANNEL" echo "REPLICATION_CHANNEL: $REPLICATION_CHANNEL"
echo "" echo ""
if [ -f $ACDIR/no-overwrite ]; then echo "I did NOT overwrite env.sh if it already existed! Use the refreshInstance.sh script to update your configuration!"
echo "ATTENTION: I found the file $ACDIR/no-overwrite. This means that I did NOT use env.sh from this branch."
fi
echo "Installation complete. You may now start the server using ./start" echo "Installation complete. You may now start the server using ./start"
fi fi