From a3ce3f7eabbb746aa9ced430bcd55391742c738b Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Tue, 16 Oct 2012 23:57:41 +0200
Subject: o Improved completion (again). o Consistent usage of APPSH_HOME and
BASEDIR.
---
.app/lib/app-operate | 7 ++++---
.app/lib/pid-method | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
(limited to '.app/lib')
diff --git a/.app/lib/app-operate b/.app/lib/app-operate
index d2f3a00..7789939 100644
--- a/.app/lib/app-operate
+++ b/.app/lib/app-operate
@@ -27,7 +27,7 @@ run_control() {
if [ -z "$bin" ]
then
- bin=$BASEDIR/.app/lib/pid-method
+ bin=$APPSH_HOME/.app/lib/pid-method
fi
if [ ! -x "$bin" ]
@@ -45,6 +45,7 @@ run_control() {
$e \
APPSH_METHOD=$method \
APPSH_BASEDIR=$BASEDIR \
+ APPSH_HOME=$APPSH_HOME \
APPSH_NAME=$name \
APPSH_INSTANCE=$instance \
$bin
@@ -54,10 +55,10 @@ run_control() {
case $ret in
0)
- echo "Application ${method}ed"
+ echo "Method ${method} completed successfully for $name/$instance"
;;
*)
- echo "Error ${method}ing $name/$instance"
+ echo "Error running method ${method} for $name/$instance"
;;
esac
)
diff --git a/.app/lib/pid-method b/.app/lib/pid-method
index e718849..b4a672e 100755
--- a/.app/lib/pid-method
+++ b/.app/lib/pid-method
@@ -4,7 +4,7 @@ set -e
PID_FILE=$APPSH_BASEDIR/.app/var/pid/$name-$instance.pid
-. $APPSH_BASEDIR/.app/lib/app-conf
+. $APPSH_HOME/.app/lib/app-conf
bin=`get_conf $APPSH_BASEDIR $APPSH_NAME $APPSH_INSTANCE app.bin`
--
cgit v1.2.3