diff options
author | Eric Hameleers <alien@slackware.com> | 2018-11-04 14:43:17 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-11-04 14:43:17 +0000 |
commit | cb75e9078fa85362de2a115afc2bf7e5e025c383 (patch) | |
tree | 4de6fde01ac8da4868c06a224caaa1c53b2ae2ae | |
parent | 9a6be3b5d3b2a877c1ee8c9e97276e0cf1007cd0 (diff) | |
download | asb-cb75e9078fa85362de2a115afc2bf7e5e025c383.tar.gz asb-cb75e9078fa85362de2a115afc2bf7e5e025c383.tar.xz |
shellinabox: fix the doinst logic
-rwxr-xr-x | shellinabox/build/shellinabox.SlackBuild | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/shellinabox/build/shellinabox.SlackBuild b/shellinabox/build/shellinabox.SlackBuild index 75687ce3..fb51a5bd 100755 --- a/shellinabox/build/shellinabox.SlackBuild +++ b/shellinabox/build/shellinabox.SlackBuild @@ -209,13 +209,12 @@ preserve_perms() { cat \${NEW} > \${NEW}.incoming mv \${NEW}.incoming \${NEW} fi - mv \${NEW} \${OLD} + config \${NEW} } # Preserve permissions, but move this into place. Otherwise the net # connection could be lost at a remote location. -preserve_perms etc/rc.d/rc.shellinabox.new -config etc/rc.d/rc.shellinabox.new +preserve_perms etc/rc.d/rc.shellinabox.new config etc/sysconfig/shellinabox.new # @@ -235,7 +234,13 @@ fi EOINS # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +if [ -d $PKG/usr/share/doc/$PRGNAM ]; then + mkdir -p $PKG/usr/doc + mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION + rmdir $PKG/usr/share/doc +else + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +fi cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION |