summaryrefslogtreecommitdiff
path: root/.app/lib/app-conf
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2012-10-09 18:49:27 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2012-10-09 18:59:21 +0200
commit8b1d11508e985cc2cd97a1d70d01574e78109569 (patch)
tree0f16b0320c8417e27150f305a6b316c3438c23b9 /.app/lib/app-conf
parentcb38e87306cde54144867ef7141682fc7fad0980 (diff)
downloadapp.sh-8b1d11508e985cc2cd97a1d70d01574e78109569.tar.gz
app.sh-8b1d11508e985cc2cd97a1d70d01574e78109569.tar.bz2
app.sh-8b1d11508e985cc2cd97a1d70d01574e78109569.tar.xz
app.sh-8b1d11508e985cc2cd97a1d70d01574e78109569.zip
o Reworked app starting.
Diffstat (limited to '.app/lib/app-conf')
-rw-r--r--.app/lib/app-conf39
1 files changed, 29 insertions, 10 deletions
diff --git a/.app/lib/app-conf b/.app/lib/app-conf
index 141524d..b1b06c0 100644
--- a/.app/lib/app-conf
+++ b/.app/lib/app-conf
@@ -3,8 +3,11 @@
key_expr="[a-zA-Z][_a-zA-Z0-9]*\.[a-zA-Z][_a-zA-Z0-9]*"
get_conf() {
- local key=$1
- local default=$2
+ local BASEDIR=$1
+ local name=$2
+ local instance=$3
+ local key=$4
+ local default=$5
local file=$BASEDIR/$name/$instance/current/etc/app.conf
if [ ! -r $file ]
@@ -24,6 +27,9 @@ get_conf() {
}
get_conf_all() {
+ local BASEDIR=$1
+ local name=$2
+ local instance=$3
local file=$BASEDIR/$name/$instance/current/etc/app.conf
if [ ! -r $file ]
@@ -35,9 +41,13 @@ get_conf_all() {
}
get_conf_in_group() {
- prefix=$1
+ local BASEDIR=$1
+ local name=$2
+ local instance=$3
+ local prefix=$1
- get_conf_all | sed -n "s,^[ ]*${prefix}\.\([._a-zA-Z]*\)=\(.*\)$,\1=\2,p"
+ get_conf_all "$BASEDIR" "$name" "$instance" | \
+ sed -n "s,^[ ]*${prefix}\.\([._a-zA-Z]*\)=\(.*\)$,\1=\2,p"
}
assert_key() {
@@ -52,8 +62,12 @@ assert_key() {
}
conf_set() {
- local key=$1
- local value=$2
+ local BASEDIR=$1
+ local name=$2
+ local instance=$3
+ local key=$4
+ local value=$5
+
local file=$BASEDIR/$name/$instance/current/etc/app.conf
assert_key "$key"
@@ -68,7 +82,10 @@ conf_set() {
}
conf_delete() {
- key=$1
+ local BASEDIR=$1
+ local name=$2
+ local instance=$3
+ local key=$4
local file=$BASEDIR/$name/$instance/current/etc/app.conf
@@ -92,6 +109,8 @@ conf_usage() {
}
method_conf() {
+ local name
+ local instance
local mode="list"
while getopts "n:i:s:d:" opt
@@ -124,17 +143,17 @@ method_conf() {
case $mode in
list)
- get_conf_all | (IFS==; while read key value
+ get_conf_all "$BASEDIR" "$name" "$instance" | (IFS==; while read key value
do
printf "%-20s %-20s" "$key" "$value"
echo
done)
;;
set)
- conf_set "$key" "$value"
+ conf_set "$BASEDIR" "$name" "$instance" "$key" "$value"
;;
delete)
- conf_delete "$key"
+ conf_delete "$BASEDIR" "$name" "$instance" "$key"
;;
esac
}