summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@gentoo.org>2002-06-26 23:13:14 +0000
committerBrandon Low <lostlogic@gentoo.org>2002-06-26 23:13:14 +0000
commitc63c629286944df1d29f55fb3a1f53fdf61a77e0 (patch)
tree9afa086de4c809e3233fbda537dc916e7c2f3b38 /app-admin
parentusing mirror:// and removed the old ebuilds (diff)
downloadgentoo-2-c63c629286944df1d29f55fb3a1f53fdf61a77e0.tar.gz
gentoo-2-c63c629286944df1d29f55fb3a1f53fdf61a77e0.tar.bz2
gentoo-2-c63c629286944df1d29f55fb3a1f53fdf61a77e0.zip
trance whined more
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/gentoolkit/files/etc-update/etc-update11
1 files changed, 6 insertions, 5 deletions
diff --git a/app-admin/gentoolkit/files/etc-update/etc-update b/app-admin/gentoolkit/files/etc-update/etc-update
index c35596fe66f3..391de619b05c 100644
--- a/app-admin/gentoolkit/files/etc-update/etc-update
+++ b/app-admin/gentoolkit/files/etc-update/etc-update
@@ -8,7 +8,7 @@
# Leo Lipelis <aeoo@gentoo.org>
# Karl Trygve Kalleberg <karltk@gentoo.org>
#
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/etc-update/etc-update,v 1.8 2002/06/26 23:07:51 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/etc-update/etc-update,v 1.9 2002/06/26 23:13:14 lostlogic Exp $
function get_config() {
item=$1
@@ -36,15 +36,16 @@ function scan() {
rpath=`echo "${file}" | sed -e "s:/[^/]*$::"`
rfile=`echo "${file}" | sed -e "s:^.*/::"`
for mpath in ${CONFIG_PROTECT_MASK}; do
- if [[ "${rpath}" == "${mpath}" ]]; then
+ if [[ "${rpath}" == "${mpath}"* ]]; then
mv ${rpath}/${rfile} ${rpath}/${rfile:10}
break
fi
done
[ ! -f ${file} ] && continue
- if [[ "${ofile:10}" != "${rfile:10}" ]] || [[ ${opath} != ${rpath} ]]; then
+ if [[ "${ofile:10}" != "${rfile:10}" ]] ||
+ [[ ${opath} != ${rpath} ]]; then
if [[ -z `diff -Nua ${rpath}/${rfile} ${rpath}/${rfile:10}|
- grep "^[+-][^+-]"|grep -v '# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/etc-update/etc-update,v 1.8 2002/06/26 23:07:51 lostlogic Exp $'` ]]; then
+ grep "^[+-][^+-]"|grep -v '# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/etc-update/etc-update,v 1.9 2002/06/26 23:13:14 lostlogic Exp $'` ]]; then
mv ${rpath}/${rfile} ${rpath}/${rfile:10}
continue
else
@@ -57,7 +58,7 @@ function scan() {
fi
fi
if [[ -z `diff -Nua ${rpath}/${rfile} ${rpath}/${ofile}|
- grep "^[+-][^+-]"|grep -v '# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/etc-update/etc-update,v 1.8 2002/06/26 23:07:51 lostlogic Exp $'` ]]; then
+ grep "^[+-][^+-]"|grep -v '# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/etc-update/etc-update,v 1.9 2002/06/26 23:13:14 lostlogic Exp $'` ]]; then
mv ${rpath}/${rfile} ${rpath}/${ofile}
continue
else