| 1 |
Author: vapier |
| 2 |
Date: 2009-06-28 16:12:28 +0000 (Sun, 28 Jun 2009) |
| 3 |
New Revision: 13723 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/etc-update |
| 7 |
Log: |
| 8 |
make sure etc-update sorts updates in the order (1) leading dir path (2) filename (3) cfg update |
| 9 |
|
| 10 |
Modified: main/trunk/bin/etc-update |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/bin/etc-update 2009-06-28 14:48:34 UTC (rev 13722) |
| 13 |
+++ main/trunk/bin/etc-update 2009-06-28 16:12:28 UTC (rev 13723) |
| 14 |
@@ -63,8 +63,8 @@ |
| 15 |
# The below set -f turns off file name globbing in the ${find_opts} expansion. |
| 16 |
for file in $(set -f ; find ${path}/ ${find_opts} \ |
| 17 |
! -name '.*~' ! -iname '.*.bak' -print | |
| 18 |
- sed -e "s:\(^.*/\)\(\._cfg[0-9]*_\)\(.*$\):\1\2\3\%\2\%\3:" | |
| 19 |
- sort -t'%' -k3 -k2 | LANG=POSIX LC_ALL=POSIX cut -f1 -d'%'); do |
| 20 |
+ sed -e "s:\(^.*/\)\(\._cfg[0-9]*_\)\(.*$\):\1\2\3\%\1%\2\%\3:" | |
| 21 |
+ sort -t'%' -k2,2 -k4,4 -k3,3 | LANG=POSIX LC_ALL=POSIX cut -f1 -d'%'); do |
| 22 |
|
| 23 |
rpath=$(echo "${file/\/\///}" | sed -e "s:/[^/]*$::") |
| 24 |
rfile=$(echo "${file/\/\///}" | sed -e "s:^.*/::") |
Archives