aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.gitignore2
-rw-r--r--etc/app.conf1
-rw-r--r--etc/config.properties.template (renamed from config.properties.template)0
-rw-r--r--pom.xml13
-rw-r--r--src/main/java/io/trygvis/esper/testing/Config.java2
-rw-r--r--src/main/unix/files/root/bin/method37
-rw-r--r--src/main/unix/files/scripts/postinstall3
7 files changed, 56 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index c396f47..a9f72a1 100755
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/pom.xml b/pom.xml
index adb8e12..8547498 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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