diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-10-21 23:28:03 +0200 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-10-21 23:28:03 +0200 |
commit | 22f0f794ac4e40866c5d390a7b27b8bd6713e681 (patch) | |
tree | da5f9febae11d7819a0d908b9505997575b04628 /bin | |
parent | 989edff55111db3b457c9e04f3abf296e6ac555c (diff) | |
download | app.sh-22f0f794ac4e40866c5d390a7b27b8bd6713e681.tar.gz app.sh-22f0f794ac4e40866c5d390a7b27b8bd6713e681.tar.bz2 app.sh-22f0f794ac4e40866c5d390a7b27b8bd6713e681.tar.xz app.sh-22f0f794ac4e40866c5d390a7b27b8bd6713e681.zip |
o Removing silly formatting that left extra spaced at the end of
lines.
o Fixing bug in app-conf get subcommand that would only return the
first part of values with an equals sign.
o Makding sure $HOME is always set.
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/app-conf | 8 | ||||
-rwxr-xr-x | bin/app-init | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bin/app-conf b/bin/app-conf index 88498e9..cd127a2 100755 --- a/bin/app-conf +++ b/bin/app-conf @@ -28,7 +28,7 @@ format_conf() { local IFS== while read key value do - printf "%-20s %-20s" "$key" "$value" + printf "%-20s %s" "$key" "$value" echo done } @@ -140,12 +140,12 @@ case "$command" in usage fi - app-cat-conf -l "$location" -n "$1" | cut -f 2 -d = | format_conf | sed "s, *$,," + app-cat-conf -l "$location" -n "$1" | cut -f 2- -d = ;; list) if [ $# -gt 0 ] then - usage "Extra options." + usage "Extra arguments." fi app-cat-conf -l "$location" | format_conf @@ -153,7 +153,7 @@ case "$command" in set) if [ $# -ne 2 ] then - usage + usage "Expected exactly two arguments" fi conf_set "$file" "$1" "$2" diff --git a/bin/app-init b/bin/app-init index 7098cb3..fb4f7cd 100755 --- a/bin/app-init +++ b/bin/app-init @@ -12,6 +12,7 @@ usage_text() { echo "usage: $usage_app -d dir <resolver> <resolver args>" } +dir= while getopts "d:" opt do case $opt in @@ -32,7 +33,7 @@ resolver_name="$1"; shift if [ -z "$dir" ] then - usage + usage "-d is required" fi if [ -e "$dir" ] |