diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2013-10-26 11:35:57 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-10-26 11:36:34 +0200 |
| commit | 2474a9e50e5d21ed6b3fd825d9fe565b79f62014 (patch) | |
| tree | a8faed6b79069c35a39983831f8f3089878545a2 | |
| parent | 22f0f794ac4e40866c5d390a7b27b8bd6713e681 (diff) | |
| download | app.sh-2474a9e50e5d21ed6b3fd825d9fe565b79f62014.tar.gz app.sh-2474a9e50e5d21ed6b3fd825d9fe565b79f62014.tar.bz2 app.sh-2474a9e50e5d21ed6b3fd825d9fe565b79f62014.tar.xz app.sh-2474a9e50e5d21ed6b3fd825d9fe565b79f62014.zip | |
o Adding '-f [file]' option to app-conf set.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | bin/app-conf | 15 | ||||
| -rw-r--r-- | docs/Makefile | 8 | ||||
| -rwxr-xr-x | test/app-conf.bats | 20 |
4 files changed, 41 insertions, 3 deletions
@@ -2,6 +2,7 @@ apps.list downloads target docs/*.html +docs/*.1 .app/var /*/.gitignore diff --git a/bin/app-conf b/bin/app-conf index cd127a2..96e52cf 100755 --- a/bin/app-conf +++ b/bin/app-conf @@ -151,9 +151,22 @@ case "$command" in app-cat-conf -l "$location" | format_conf ;; set) + while getopts "f:" opt + do + case $opt in + f) + file="$OPTARG" + shift 2; + ;; + *) + usage "Unknown argument: $OPTARG" + ;; + esac + done + if [ $# -ne 2 ] then - usage "Expected exactly two arguments" + usage "Expected exactly two arguments." fi conf_set "$file" "$1" "$2" diff --git a/docs/Makefile b/docs/Makefile index f9ae4ea..c62e70c 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,9 +1,13 @@ TXT=$(wildcard *.txt) HTML=$(patsubst %.txt,%.html,$(TXT)) -all: $(HTML) +MAN=$(patsubst %.txt,%.1,$(TXT)) +all: $(HTML) $(MAN) %.html: %.txt asciidoc -a data-uri -a icons -a toc -a max-width=55em $< +%.1: %.txt + a2x --doctype manpage --format manpage $< + clean: - rm -rf $(wildcard *.html) + rm -rf $(wildcard *.html) $(wildcard *.1) diff --git a/test/app-conf.bats b/test/app-conf.bats index 5c5da05..97041cd 100755 --- a/test/app-conf.bats +++ b/test/app-conf.bats @@ -103,6 +103,26 @@ setup_inner() { eq '${#lines[*]}' 2 } +@test "./app conf set -f" { + echo "" > .app/config + + app conf set -f myconfig group.foo bar + eq '${#lines[*]}' 0 + + app_libexec app-cat-conf -f myconfig + eq '${lines[0]}' "group.foo=bar" + eq '${#lines[*]}' 1 + + run cat .app/config + eq '$status' 0 + eq '${#lines[*]}' 0 + + run cat myconfig + eq '$status' 0 + eq '${lines[0]}' "group.foo=bar" + eq '${#lines[*]}' 1 +} + @test "./app conf set - values with '=' and spaces" { echo > .app/config app conf set app.env "JAVA_OPTS=-Xmx1G -Dawesome=true" |