summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2007-02-19 12:16:42 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2007-02-19 12:16:42 +0000
commite4104835556c64f7187164cc3b6241aa4a63375c (patch)
tree9cbb886e81a6159e8755242d222978510886fcc7
parent3e8dc3717f14c72885c1b88a9c2fb0e2dd7dde51 (diff)
downloadalpine-conf-e4104835556c64f7187164cc3b6241aa4a63375c.tar.bz2
alpine-conf-e4104835556c64f7187164cc3b6241aa4a63375c.tar.xz
release 0.8_beta2. fixed bug update-conf and lbu commit whern there already exist a /etc/lbu/include file
-rw-r--r--lbu6
-rw-r--r--update-conf2
2 files changed, 4 insertions, 4 deletions
diff --git a/lbu b/lbu
index d7616e9..65e2579 100644
--- a/lbu
+++ b/lbu
@@ -173,9 +173,9 @@ cmd_commit() {
cd "$ROOT"
# for upgrading from packages.list times
- if [ ! -f "$INCLUDE_LIST" ] ; then
- mkdir -p $(dirname "$INCLUDE_LIST")
- echo "var/lib/apk/world" > "$INCLUDE_LIST"
+ mkdir -p $(dirname "$INCLUDE_LIST")
+ if ! grep "var/lib/apk/world" "$INCLUDE_LIST" >/dev/null 2>&1 ; then
+ echo "var/lib/apk/world" >> "$INCLUDE_LIST"
fi
# Automatically add list and modified files
diff --git a/update-conf b/update-conf
index 1e88e72..6a8ab16 100644
--- a/update-conf
+++ b/update-conf
@@ -41,7 +41,7 @@ while getopts "alih" opt ; do
done
shift `expr $OPTIND - 1`
-find "$ROOT/etc" -name '*.apk-new' | while read apknew ; do
+for apknew in $(find "$ROOT/etc" -name '*.apk-new') ; do
p="${apknew%.apk-new}"
f="${p#${ROOT}/}"
unset choice