diff options
| -rw-r--r-- | network/PaleMoon/PaleMoon.SlackBuild | 27 | ||||
| -rw-r--r-- | network/PaleMoon/PaleMoon.desktop | 2 |
2 files changed, 19 insertions, 10 deletions
diff --git a/network/PaleMoon/PaleMoon.SlackBuild b/network/PaleMoon/PaleMoon.SlackBuild index d561b8bfc7..0c60a47665 100644 --- a/network/PaleMoon/PaleMoon.SlackBuild +++ b/network/PaleMoon/PaleMoon.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=PaleMoon VERSION=${VERSION:-27.0.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -122,10 +122,10 @@ rm -rf Pale-Moon-${VERSION}_Release tar xzvf $CWD/${VERSION}_Release.tar.gz || tar xzvf $CWD/Pale-Moon-${VERSION}_Release.tar.gz cd Pale-Moon-${VERSION}_Release chown -R root:root . - find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Crude hack so that /usr/lib/mozilla/plugins points to @@ -150,9 +150,9 @@ export CXXFLAGS="$SLKCFLAGS" # Dev tools are enabled by default in the official binaries, so we should do the same here; # passing DEVTOOLS=no to the script, however, will disable them. if [ "$DEVTOOLS" = "no" ]; then - DEVTOOLS="" + DEVTOOLS="" else - DEVTOOLS="--enable-devtools" + DEVTOOLS="--enable-devtools" fi # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. @@ -208,13 +208,13 @@ rm -f usr/lib${LIBDIRSUFFIX}/palemoon-$VERSION/palemoon-bin # Append a version suffix to the binary, if we desire to install this version of # PaleMoon along side any other version of PaleMoon. if [ "$APPEND_VERSION_SUFFIX" = "yes" ]; then - mv usr/bin/palemoon usr/bin/palemoon-$VERSION + mv usr/bin/palemoon usr/bin/palemoon-$VERSION fi # Use system provided Hunspell, if desired. if [ "${USE_SYSTEM_HUNSPELL}" = "yes" ]; then - rm -rfv usr/lib${LIBDIRSUFFIX}/palemoon-$VERSION/dictionaries - cp -vsr /usr/share/hunspell usr/lib${LIBDIRSUFFIX}/palemoon/dictionaries + rm -rfv usr/lib${LIBDIRSUFFIX}/palemoon-$VERSION/dictionaries + cp -vsr /usr/share/hunspell usr/lib${LIBDIRSUFFIX}/palemoon/dictionaries fi # Icons @@ -233,6 +233,15 @@ ln -s /usr/lib${LIBDIRSUFFIX}/palemoon-$VERSION/browser/icons/mozicon128.png \ sed "s|@VERSION@|$VERSION|" $CWD/$PRGNAM.desktop \ > $PKG/usr/share/applications/$PRGNAM.desktop +# Set the correct exec path inside of the .desktop +if [ "$APPEND_VERSION_SUFFIX" = "yes" ]; then + sed -i 's|@APPEND_VERSION_SUFFIX@|-$VERSION|g' \ + $PKG/usr/share/applications/$PRGNAM.desktop +else + sed -i 's|@APPEND_VERSION_SUFFIX@||g' \ + $PKG/usr/share/applications/$PRGNAM.desktop +fi + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/PaleMoon/PaleMoon.desktop b/network/PaleMoon/PaleMoon.desktop index d1554dfdad..b27cc6c9fb 100644 --- a/network/PaleMoon/PaleMoon.desktop +++ b/network/PaleMoon/PaleMoon.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=Pale Moon Web Browser Comment=Browse the World Wide Web Keywords=Internet;WWW;Browser;Web;Explorer -Exec=palemoon-@VERSION@ %u +Exec=palemoon@APPEND_VERSION_SUFFIX@ %u Terminal=false X-MultipleArgs=false Type=Application |