network/Signal-Desktop: Multiple fixes.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 27 insertions, 11 deletions

diff --git a/network/Signal-Desktop/README b/network/Signal-Desktop/README
index 9e27e49589..738d21f711 100644
--- a/network/Signal-Desktop/README
+++ b/network/Signal-Desktop/README
@@ -5,3 +5,9 @@ Signal is an encrypted instant messaging and voice calling
 application for Android and iOS. It uses the Internet to
 send one-to-one and group messages, which can include images
 and video messages, and make one-to-one voice calls.
+
+Please be sure to run the SlackBuild with a real root shell
+using 'su -l'.  If the build fails with an access error, remove
+the npm cache:
+
+  rm -rf ~/.npm/
diff --git a/network/Signal-Desktop/Signal-Desktop.SlackBuild b/network/Signal-Desktop/Signal-Desktop.SlackBuild
index 76636726d6..b37c036d36 100644
--- a/network/Signal-Desktop/Signal-Desktop.SlackBuild
+++ b/network/Signal-Desktop/Signal-Desktop.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Signal-Desktop
 
-# Copyright 2017 Rodrigo Gimenez <rodrigog83[at]gmail[dot]com>
+# Copyright 2017 Rodrigo Gimenez <estrod[at]zoho[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -35,7 +35,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -49,23 +48,28 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $TMP/$PRGNAM-$VERSION
-npm install
-node_modules/grunt-cli/bin/grunt -f
 chown -R root:root .
+
+npm install
+node_modules/grunt-cli/bin/grunt
+
 cd dist
+
 install -Ddm755 "$PKG/opt/$PRGNAM"
-install -Ddm755 "$PKG/usr/bin"
-install -Ddm755 "$PKG/usr/share/applications"
 cp -r * "$PKG/opt/$PRGNAM"
+
+install -Ddm755 "$PKG/usr/bin"
 echo -e "#!/bin/bash\n/usr/bin/nw /opt/$PRGNAM" > "$PKG/usr/bin/signal"
 chmod +x "$PKG/usr/bin/signal"
 
+install -Ddm755 "$PKG/usr/share/applications"
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 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/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 for icon_size in 16 32 48 128 250 256; do
 	icon_dir="$PKG/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
diff --git a/network/Signal-Desktop/Signal-Desktop.info b/network/Signal-Desktop/Signal-Desktop.info
index 129f04a516..2c710b1115 100644
--- a/network/Signal-Desktop/Signal-Desktop.info
+++ b/network/Signal-Desktop/Signal-Desktop.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/WhisperSystems/Signal-Desktop/archive/v0.33.0/Signa
 MD5SUM="316958270fe9c6f9ca19d4f627bb0d10"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="nodejs nwjs"
+REQUIRES="nodejs nwjs rubygem-sass"
 MAINTAINER="Rodrigo Gimenez"
-EMAIL="rodrigog83[at]gmail[dot]com"
+EMAIL="estrod[at]zoho[dot]com"
diff --git a/network/Signal-Desktop/doinst.sh b/network/Signal-Desktop/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/network/Signal-Desktop/doinst.sh
+++ b/network/Signal-Desktop/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/Signal-Desktop/slack-desc b/network/Signal-Desktop/slack-desc
index f79f60b29b..ee7eca4ab6 100644
--- a/network/Signal-Desktop/slack-desc
+++ b/network/Signal-Desktop/slack-desc
@@ -5,13 +5,13 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-              |-----handy-ruler----------------------------------------------|
+              |-----handy-ruler------------------------------------------------------|
 Signal-Desktop: Signal-Desktop (Signal Private Messenger for the Desktop)
 Signal-Desktop:
 Signal-Desktop: Signal is an encrypted instant messaging and voice calling
 Signal-Desktop: application for Android and iOS. It uses the Internet to send
 Signal-Desktop: one-to-one and group messages, which can include images and
-Singal-Desktop: video messages, and make one-to-one voice calls.
+Signal-Desktop: video messages, and make one-to-one voice calls.
 Signal-Desktop:
 Signal-Desktop:
 Signal-Desktop: