diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2016-11-02 22:02:43 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2016-11-02 22:11:19 +0100 |
| commit | cb474e20d6ff923a8f338f26b93234411065ffc0 (patch) | |
| tree | 4e3c16c18adcc9fd7b3b58f45064ec752f47485e /update-conf.in | |
| parent | 9f65b05ba2b0b291f9973228a5c4395508b95b16 (diff) | |
| download | alpine-conf-cb474e20d6ff923a8f338f26b93234411065ffc0.tar.bz2 alpine-conf-cb474e20d6ff923a8f338f26b93234411065ffc0.tar.xz | |
fix mixed tabs & spaces and surplus empty lines at EOF
Diffstat (limited to 'update-conf.in')
| -rw-r--r-- | update-conf.in | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/update-conf.in b/update-conf.in index f287dd9..61ea654 100644 --- a/update-conf.in +++ b/update-conf.in @@ -1,6 +1,5 @@ #!/bin/sh - PREFIX= VERSION=@VERSION@ @@ -64,19 +63,19 @@ for apknew in $(find "$ROOT/etc" -name '*.apk-new') ; do unset choice if [ "$lflag" ] ; then - + # just list the file if [ "$aflag" ] || is_modified "$f" ; then echo "$p" fi - + elif [ "$aflag" ] || is_modified "$f" ; then if [ "$iflag" ] && is_initd "$f" ; then echo "Autoupdating $p" mv "$apknew" "$p" continue fi - + diff -u "$p" "$apknew" # ask user what to do with the file @@ -89,7 +88,7 @@ for apknew in $(find "$ROOT/etc" -name '*.apk-new') ; do n) continue;; s) diff -u "$p" "$apknew" | ${PAGER:-less} unset choice - ;; + ;; e) ${EDITOR:-vi} "$apknew" ; unset choice;; v) if [ "$vflag" ]; then vimdiff "$p" "$apknew" @@ -106,4 +105,3 @@ for apknew in $(find "$ROOT/etc" -name '*.apk-new') ; do mv "$apknew" "$p" fi done - |