diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2020-11-14 23:32:59 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2020-11-22 01:14:28 +0700 |
| commit | 7f09470ed92c3b3d1021cf8fcd54a4335fd0638d (patch) | |
| tree | 36975187510d82ceedee40cae226b009793f8027 | |
| parent | f9f687a91b9c13e8b43d770ec4c952a54881f6f9 (diff) | |
network/strongswan: Fix the no-clobber routine.
The package's /install dir should not contain
additional files
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | network/strongswan/doinst.sh | 29 | ||||
| -rw-r--r-- | network/strongswan/strongswan.SlackBuild | 4 |
2 files changed, 12 insertions, 21 deletions
diff --git a/network/strongswan/doinst.sh b/network/strongswan/doinst.sh index a88995c5ed38c..19a6ff6ac8545 100644 --- a/network/strongswan/doinst.sh +++ b/network/strongswan/doinst.sh @@ -1,22 +1,13 @@ - config() { - NEW="$1" - OLD="${1%.new}" - if [ ! -r $OLD ]; - then - # If there's no config file by that name, mv it over: - mv $NEW $OLD - elif [ "$(md5sum <$OLD)" = "$(md5sum <$NEW)" ]; - then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... } -# doinst.sh reads the list of files from ./install/conffiles at install time. -# ./install/conffiles was generated by strongswan.SlackBuild -for cf in $(cat install/conffiles) -do - config $cf.new -done diff --git a/network/strongswan/strongswan.SlackBuild b/network/strongswan/strongswan.SlackBuild index a36d0c351c3d5..d9d031022461a 100644 --- a/network/strongswan/strongswan.SlackBuild +++ b/network/strongswan/strongswan.SlackBuild @@ -165,7 +165,7 @@ cd $PKG for i in $(find etc -type f) do mv $i $i.new - echo $i -done 1>>$PKG/install/conffiles + echo "config $i.new" >> $PKG/install/doinst.sh +done /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |