diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-27 12:58:25 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-27 12:58:25 +0100 |
| commit | 11c930f71db58201994265b71a8f76187f1dbda1 (patch) | |
| tree | b0f90a4d631b946e4cb3d3755e9da1e3198aee71 /libexec/app-cat-conf | |
| parent | 6076c500405b7759845496dce6d3b9e1dc619cca (diff) | |
| download | app.sh-11c930f71db58201994265b71a8f76187f1dbda1.tar.gz app.sh-11c930f71db58201994265b71a8f76187f1dbda1.tar.bz2 app.sh-11c930f71db58201994265b71a8f76187f1dbda1.tar.xz app.sh-11c930f71db58201994265b71a8f76187f1dbda1.zip | |
o Adding a common header to all scripts.
o Disabling un-used tests and apps for now.
Diffstat (limited to 'libexec/app-cat-conf')
| -rwxr-xr-x | libexec/app-cat-conf | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/libexec/app-cat-conf b/libexec/app-cat-conf index 78d3c36..5da435e 100755 --- a/libexec/app-cat-conf +++ b/libexec/app-cat-conf @@ -1,16 +1,17 @@ #!/bin/bash -if [[ $APPSH_HOME == "" ]] -then - APPSH_HOME=`dirname "$0"` - APPSH_HOME=`cd "$APPSH_HOME/.." && pwd` -fi - set -e +set -u + +APPSH_HOME=$(cd $(dirname "$0")/.. && pwd) + +. $APPSH_HOME/lib/common +# HEADER END key_expr="[a-zA-Z][_a-zA-Z0-9]*" file=.app/config +name="" while getopts "f:n:" opt do @@ -35,13 +36,10 @@ else filter="s,^\($name\)=\(.*\),\1=\2,p" fi -if [[ $APPSH_DEFAULT_CONFIG == "" ]] -then - APPSH_DEFAULT_CONFIG=$APPSH_HOME/lib/default-config -fi +APPSH_DEFAULT_CONFIG=${APPSH_DEFAULT_CONFIG-$APPSH_HOME/lib/default-config} # The awk script makes sure each key only appears once cat "$file" "$APPSH_DEFAULT_CONFIG" | \ - sed -n -e "$filter" $extra | \ + sed -n -e "$filter" | \ awk -F = ' (!($1 in a)){a[$1]; print }' | \ sort |