1 files changed, 24 insertions, 23 deletions
diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild
index 18c8e28c87..6e8c0b3301 100644
--- a/network/palemoon/palemoon.SlackBuild
+++ b/network/palemoon/palemoon.SlackBuild
@@ -24,13 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=palemoon
-VERSION=${VERSION:-27.2.1}
+VERSION=${VERSION:-27.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
 case "$( uname -m )" in
-    i686) ARCH=i686 ;;
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
     *) ARCH=$( uname -m ) ;;
 esac
@@ -44,16 +44,17 @@ OUTPUT=${OUTPUT:-/tmp}
 # We don't need cflags since nothing is being compiled here.
 # We do need to check the architecture though and abort when it's not
 # supported.
-if [ ! "$ARCH" = "i686" ] && [ ! "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "i686" ]; then
+  # Check for sse2 flag and abort if not found
+  if ! grep -q sse2 /proc/cpuinfo; then
+    echo "No required SSE2 support detected. Aborting."
+    exit 1
+  fi
+elif [ "$ARCH" != "x86_64" ]; then
   echo "Sorry, binary packages are available only for i686 and x86_64. Aborting."
   exit 1
 fi
 
-# Check for sse2 flag and abort if not found
-[[ $(cat /proc/cpuinfo|grep sse2) ]] || {
-  echo "No required SSE2 support detected. Aborting."
-  exit 1; }
-
 set -e
 
 rm -rf $PKG
@@ -61,32 +62,30 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.en-US.linux-$ARCH.tar.bz2
-chown -R root:root $PRGNAM
+cd $PRGNAM
+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 \
-\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
--o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ \( -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 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Use system hunspell if user wants it
-if [[ $USE_SYSTEM_SPELLCHECK == "yes" ]]; then
-  rm -rf palemoon/dictionaries
-  ln -sv /usr/share/hunspell palemoon/dictionaries
+if [ "$USE_SYSTEM_SPELLCHECK" = "yes" ]; then
+  rm -rf dictionaries
+  ln -sv /usr/share/hunspell dictionaries
 fi
 
-# Create directories
-mkdir -p $PKG/opt
-mkdir -p $PKG/usr/bin
-mkdir -p $PKG/usr/share/icons/hicolor/{16x16,32x32,48x48,128x128}/apps
-mkdir -p $PKG/usr/share/applications
-
 # Install pale moon into /opt
-cp -vr palemoon $PKG/opt
+mkdir -p $PKG/opt/palemoon
+cp -vr * $PKG/opt/palemoon
 
 # Link stuff
 ## binary
+mkdir -p $PKG/usr/bin
 ln -s /opt/palemoon/palemoon $PKG/usr/bin/palemoon
 ## icons
+mkdir -p $PKG/usr/share/icons/hicolor/{16x16,32x32,48x48,128x128}/apps
 ln -s /opt/palemoon/browser/chrome/icons/default/default16.png \
   $PKG/usr/share/icons/hicolor/16x16/apps/palemoon.png
 ln -s /opt/palemoon/browser/chrome/icons/default/default32.png \
@@ -97,6 +96,7 @@ ln -s /opt/palemoon/browser/icons/mozicon128.png \
   $PKG/usr/share/icons/hicolor/128x128/apps/palemoon.png
 
 # Install .desktop file
+mkdir -p $PKG/usr/share/applications
 cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -107,6 +107,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}