diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2012-10-07 13:11:45 +0200 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2012-10-07 13:11:45 +0200 |
commit | 1c299756deb763ae30223bc74ed714998437e99e (patch) | |
tree | 18c9da6d9ec2aebea70c3017a25565b5d956099a /app | |
parent | be42cc56daadba8dd32418c6c4fb064e5627ac7a (diff) | |
download | app.sh-1c299756deb763ae30223bc74ed714998437e99e.tar.gz app.sh-1c299756deb763ae30223bc74ed714998437e99e.tar.bz2 app.sh-1c299756deb763ae30223bc74ed714998437e99e.tar.xz app.sh-1c299756deb763ae30223bc74ed714998437e99e.zip |
o Adding 'conf' method to list, set and delete configuration values.
Diffstat (limited to 'app')
-rwxr-xr-x | app | 95 |
1 files changed, 31 insertions, 64 deletions
@@ -3,7 +3,9 @@ set -e mkdir -p .app -export BASEDIR=`pwd` +BASEDIR=`dirname $0` +BASEDIR=`cd $BASEDIR; pwd` +export BASEDIR if [ -n "$APPSH_REPO" ] then @@ -65,40 +67,33 @@ download_artifact() { # TODO: download checksum. bash is too shady to trust } -get_conf() { - key=$1 - default=$2 +assert_is_instance() { + usage=$1 + name=$2 + instance=$3 - file=$BASEDIR/$name/$instance/latest/etc/app.conf - - if [ ! -r $file ] + if [ -z "$name" ] then - echo "$default" - return 0 + $usage "Missing required option -n." fi - value=`sed -n "s,^${key}[ ]*=[ ]*\(.*\)$,\1,p" $file` - - if [ -z "$value" ] + if [ -z "$instance" ] then - echo "$default" + $usage "Missing required option -i." fi - echo "$value" -} - -get_conf_in_group() { - prefix=$1 - - file=$BASEDIR/$name/$instance/latest/etc/app.conf + if [ ! -d $name/$instance ] + then + echo "No such application/instance: $name/$instance." >&2 + exit 1 + fi - if [ ! -r $file ] + if [ ! -e $name/$instance/latest ] then - echo "$default" - return 0 + echo "Missing 'latest' link." >&2 + exit 1 fi - sed -n "s,^${prefix}\.\([._a-zA-Z]*\)[ ]*=[ ]*\(.*\)$,\1=\2,p" $file } install_usage() { @@ -241,12 +236,12 @@ method_install() { find bin -type f | xargs chmod +x ) - if [ -r apps.list ] + if [ -r $BASEDIR/.app/var/list ] then - sed "/^$name:$instance/d" apps.list > apps.list.new + sed "/^$name:$instance/d" $BASEDIR/.app/var/list > $BASEDIR/.app/var/list.new fi - echo "$name:$instance:$version" >> apps.list.new - mv apps.list.new apps.list + echo "$name:$instance:$version" >> $BASEDIR/.app/var/list.new + mv $BASEDIR/.app/var/list.new $BASEDIR/.app/var/list } start_usage() { @@ -278,22 +273,7 @@ method_start() { esac done - if [ -z "$name" -o -z "$instance" ] - then - start_usage "Missing required option." - fi - - if [ ! -d $name/$instance ] - then - echo "No such application/instance: $name/$instance." >&2 - exit 1 - fi - - if [ ! -e $name/$instance/latest ] - then - echo "Missing 'latest' link." >&2 - exit 1 - fi + assert_is_instance start_usage "$name" "$instance" ( cd $name/$instance/latest @@ -320,39 +300,24 @@ method_start() { env -i $e \ $bin & PID=`echo $!` - echo $PID > $BASEDIR/.app/$name-$instance.pid + echo $PID > $BASEDIR/.app/var/$name-$instance.pid ) } method_list() { printf "%20s %20s %20s\n" "instance" "name" "version" - if [ ! -r apps.list ] + if [ ! -r $BASEDIR/.app/var/list ] then return fi - cat apps.list | (export IFS=:; while read instance name version + sort $BASEDIR/.app/var/list | (export IFS=:; while read instance name version do printf "%20s %20s %20s\n" "$instance" "$name" "$version" done) } -method_list_config() { - name=$1 - instance=$2 - default=$3 - - conf=$name/$instance/etc/app.conf - - if [ ! -r $conf ] - then - echo $default - fi - - get_conf port -} - method_usage() { echo "usage: $0 <method>" >&2 echo "" >&2 @@ -363,6 +328,8 @@ method_usage() { echo "Run '$0 <method>' to get more help" >&2 } +. $BASEDIR/.app/lib/app-conf + if [ $# -gt 0 ] then method=$1 @@ -379,8 +346,8 @@ case "$method" in list) method_list $@ ;; - list-config) - method_list_config $@ + conf) + method_conf $@ ;; *) method_usage $@ |