summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-05-27 22:54:50 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-05-27 22:54:50 -0600
commit25bd327ad06d0497e9888ebc7c4bbbd6cab11f12 (patch)
treeaa5da759fee295680d6cd208b1f51261e5ae75f2
parent47fb685c2d6df5995134e9b8d322f667058e505e (diff)
fix a bug in conf.sh (from the get_files->list_files switch), add unit testtesting-20130528
-rw-r--r--src/lib/conf.sh2
-rw-r--r--test/lib-conf-test.sh22
2 files changed, 23 insertions, 1 deletions
diff --git a/src/lib/conf.sh b/src/lib/conf.sh
index 8e8610e..07780ee 100644
--- a/src/lib/conf.sh
+++ b/src/lib/conf.sh
@@ -107,7 +107,7 @@ get_conf_makepkg() (
set_conf_makepkg() {
local key=$1
local val=$2
- for file in $(list_files makepkg.conf|tac); do
+ for file in $(list_files makepkg|tac); do
if [[ -w $file ]]; then
sed -i "/^\s*$key=/d" "$file"
echo "$key='$val'" >> "$file"
diff --git a/test/lib-conf-test.sh b/test/lib-conf-test.sh
new file mode 100644
index 0000000..bb6b285
--- /dev/null
+++ b/test/lib-conf-test.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env roundup
+
+describe lib/conf.sh
+
+before() {
+ tmpdir=$(mktemp -d --tmpdir test-conf.sh.XXXXXXXXXXXX)
+ stat=0
+}
+
+after() {
+ rm -rf -- "$tmpdir" "$XDG_CACHE_HOME" "$XDG_CONFIG_HOME"
+}
+
+
+it_sets_makepkg_vars_in_custom_file() {
+ unset PKGDEST
+ touch "$tmpdir/makepkg.conf"
+ . $(librelib conf.sh)
+ MAKEPKG_CONF="$tmpdir/makepkg.conf" set_conf_makepkg PKGDEST /pkgdest
+ . "$tmpdir/makepkg.conf"
+ [[ $PKGDEST == /pkgdest ]]
+}