From a0a5b8f8a204602df419fd0e01ba1e0d7651eb65 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 30 Jun 2023 13:53:08 -0400 Subject: [PATCH] network/qbittorrent: Fix doc permission. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- network/qbittorrent/qbittorrent.SlackBuild | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/network/qbittorrent/qbittorrent.SlackBuild b/network/qbittorrent/qbittorrent.SlackBuild index 888c71d08d..63463b394b 100644 --- a/network/qbittorrent/qbittorrent.SlackBuild +++ b/network/qbittorrent/qbittorrent.SlackBuild @@ -23,12 +23,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20230630 bkw: Modified by SlackBuilds.org, BUILD=2: +# - BUILD needed to be bumped due to the .desktop file change. +# - Install README.SBo with correct ownership. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qbittorrent #SRCNAM=qBittorrent VERSION=${VERSION:-4.5.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +44,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -77,9 +78,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} + -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + # Build graphical version by default gui="-DGUI=ON"; [[ "${GUI:-yes}" != "yes" ]] && gui="-DGUI=OFF" @@ -114,10 +115,13 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/etc/rc.d cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/. -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS Changelog COPYING COPYING.GPLv? README.md \ - $CWD/README.SBo $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC +cp -a AUTHORS Changelog COPYING COPYING.GPLv? README.md $PKGDOC +# 20230630 bkw: use cat instead of "cp -a" to install files from $CWD, +# there's no way to tell what the $CWD ownership/permission is. +cat $CWD/README.SBo > $PKGDOC/README.SBo +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc