From 8908e1843d5d45f4878e1bf649559294e10ccab8 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sat, 27 May 2023 20:58:55 -0400 Subject: [PATCH] academic/mendeleydesktop: Fix ARCH. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- .../mendeleydesktop/mendeleydesktop.SlackBuild | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/academic/mendeleydesktop/mendeleydesktop.SlackBuild b/academic/mendeleydesktop/mendeleydesktop.SlackBuild index 77efd5eb4b..bdc072f10d 100644 --- a/academic/mendeleydesktop/mendeleydesktop.SlackBuild +++ b/academic/mendeleydesktop/mendeleydesktop.SlackBuild @@ -41,9 +41,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 @@ -53,8 +50,9 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +SRCARCH="$ARCH" if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then - ARCH="i486" # mendeleydesktop doesn't have i586/i686 pre-builds. + SRCARCH="i486" # mendeleydesktop doesn't have i586/i686 pre-builds. LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" @@ -68,15 +66,15 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-linux-$ARCH -tar xvf $CWD/$PRGNAM-$VERSION-linux-${ARCH}.tar.bz2 -cd $PRGNAM-$VERSION-linux-$ARCH +rm -rf $PRGNAM-$VERSION-linux-$SRCARCH +tar xvf $CWD/$PRGNAM-$VERSION-linux-${SRCARCH}.tar.bz2 +cd $PRGNAM-$VERSION-linux-$SRCARCH 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 {} + # removing QT5 bundled libraries if [ "${SYSTEM_QT5:-yes}" != "no" ]; then @@ -106,7 +104,7 @@ MENDELEY_LIB=lib LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:\${MENDELEY_BASE}/\${MENDELEY_LIB} export LD_LIBRARY_PATH cd /opt/mendeleydesktop/lib/mendeleydesktop/libexec -./mendeleydesktop.$ARCH \$@ +./mendeleydesktop.$SRCARCH \$@ EOF chmod 755 $PKG/usr/bin/$PRGNAM else