diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2012-12-23 17:35:06 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2012-12-23 17:35:06 +0100 |
| commit | 8e64eff782aa9d695afc6ee92f4f428c33ec8d23 (patch) | |
| tree | 8dca8f7b424046e261ce2d82b6fd0f251fc15a1c | |
| parent | ee505cf229d193a011c2564733bff102404291ab (diff) | |
| download | esper-testing-8e64eff782aa9d695afc6ee92f4f428c33ec8d23.tar.gz esper-testing-8e64eff782aa9d695afc6ee92f4f428c33ec8d23.tar.bz2 esper-testing-8e64eff782aa9d695afc6ee92f4f428c33ec8d23.tar.xz esper-testing-8e64eff782aa9d695afc6ee92f4f428c33ec8d23.zip | |
o Moving config.properties to etc/ to make it more app.sh compatible.
| -rwxr-xr-x | .gitignore | 2 | ||||
| -rw-r--r-- | etc/app.conf | 1 | ||||
| -rw-r--r-- | etc/config.properties.template (renamed from config.properties.template) | 0 | ||||
| -rw-r--r-- | pom.xml | 13 | ||||
| -rw-r--r-- | src/main/java/io/trygvis/esper/testing/Config.java | 2 | ||||
| -rw-r--r-- | src/main/unix/files/root/bin/method | 37 | ||||
| -rw-r--r-- | src/main/unix/files/scripts/postinstall | 3 |
7 files changed, 56 insertions, 2 deletions
@@ -2,6 +2,6 @@ target .idea *.iml -config.properties +etc/config.properties *tmp* diff --git a/etc/app.conf b/etc/app.conf new file mode 100644 index 0000000..9050c9d --- /dev/null +++ b/etc/app.conf @@ -0,0 +1 @@ +app.method=bin/method diff --git a/config.properties.template b/etc/config.properties.template index a8c4b97..a8c4b97 100644 --- a/config.properties.template +++ b/etc/config.properties.template @@ -202,7 +202,20 @@ <assembly> <copyDirectory> <from>target/appassembler</from> + <to>root</to> </copyDirectory> + <setAttributes> + <includes> + <include>root/bin/*</include> + <include>scripts/*</include> + </includes> + <excludes> + <exclude>root/bin/*.bat</exclude> + </excludes> + <fileAttributes> + <mode>0755</mode> + </fileAttributes> + </setAttributes> </assembly> </configuration> </execution> diff --git a/src/main/java/io/trygvis/esper/testing/Config.java b/src/main/java/io/trygvis/esper/testing/Config.java index c080a0b..13ef1cd 100644 --- a/src/main/java/io/trygvis/esper/testing/Config.java +++ b/src/main/java/io/trygvis/esper/testing/Config.java @@ -64,7 +64,7 @@ public class Config { initLogging(); Properties properties = new Properties(); - try (FileInputStream inputStream = new FileInputStream("config.properties")) { + try (FileInputStream inputStream = new FileInputStream("etc/config.properties")) { properties.load(inputStream); } diff --git a/src/main/unix/files/root/bin/method b/src/main/unix/files/root/bin/method new file mode 100644 index 0000000..a6f1a2b --- /dev/null +++ b/src/main/unix/files/root/bin/method @@ -0,0 +1,37 @@ +#!/bin/bash + +. $APPSH_HOME/.app/lib/app-common + +method=$APPSH_METHOD + +if [ -z "$1" ] +then + echo "Missing required argument: app" >&2 + exit 1 +fi + +app=$1 +shift + +run() { + app=$1; shift + + if [ ! -x bin/$app ] + then + echo "Unknown app: $app" >&2 + exit 1 + fi + + exec "bin/$app" "$@" +} + +case "$method" in + run) + run "$app" "$@" + ;; + *) + echo "Unknown method: $method" >&2 + exit 1 + ;; +esac +exit $? diff --git a/src/main/unix/files/scripts/postinstall b/src/main/unix/files/scripts/postinstall new file mode 100644 index 0000000..07b1abc --- /dev/null +++ b/src/main/unix/files/scripts/postinstall @@ -0,0 +1,3 @@ +#!/bin/bash + +ln -s ../../../etc |