diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/usr/bin/merge-pacnews | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/util/usr/bin/merge-pacnews b/util/usr/bin/merge-pacnews index d9f0e85..019f446 100755 --- a/util/usr/bin/merge-pacnews +++ b/util/usr/bin/merge-pacnews @@ -2,18 +2,17 @@ files=$(find /etc -type f -name '*.pacnew') -for pacnew in $files -do +for pacnew in $files; do unprefixed=${pacnew%.pacnew} - if [[ ! -e "$unprefixed" ]]; then continue; fi + if [[ ! -e $unprefixed ]]; then continue; fi emacs -eval "(emerge-files nil \"$unprefixed\" \"$pacnew\" \"$unprefixed\")" otime=$(stat -c %Y "$unprefixed") ntime=$(stat -c %Y "$pacnew") - if [[ "$otime" -gt "$ntime" ]]; then + if [[ $otime -gt $ntime ]]; then rm -v "$pacnew" else echo "Skipping removal of $pacnew" |