From 6cf09676315ded11c90f11f5137fa90bf3e260b3 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 15 Oct 2019 20:58:56 +0000
Subject: Tue Oct 15 20:58:56 UTC 2019

ap/ghostscript-9.50-x86_64-1.txz:  Upgraded.
d/icecream-1.3-x86_64-2.txz:  Rebuilt.
  Have the profile scripts just check for -x /etc/rc.d/rc.iceccd, since pgrep
  with --ns $$ isn't working for non-root users. Thanks to Leopold E. Midha.
d/python-pip-19.3-x86_64-1.txz:  Upgraded.
n/bluez-5.51-x86_64-2.txz:  Rebuilt.
  Fixed path to obexd in org.bluez.obex.service.
  Thanks to Jean-Philippe Guillemin.
x/xf86-video-ati-19.1.0-x86_64-1.txz:  Upgraded.
---
 source/d/icecream/icecream.SlackBuild |  2 +-
 source/d/icecream/icecream.csh        | 18 +++---------------
 source/d/icecream/icecream.sh         |  9 +++------
 3 files changed, 7 insertions(+), 22 deletions(-)

(limited to 'source/d/icecream')

diff --git a/source/d/icecream/icecream.SlackBuild b/source/d/icecream/icecream.SlackBuild
index 922984f83..9d90f7916 100755
--- a/source/d/icecream/icecream.SlackBuild
+++ b/source/d/icecream/icecream.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=icecream
 SRCNAM=icecc
 VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/d/icecream/icecream.csh b/source/d/icecream/icecream.csh
index 6c558d615..bcd06f058 100644
--- a/source/d/icecream/icecream.csh
+++ b/source/d/icecream/icecream.csh
@@ -1,19 +1,7 @@
 #!/bin/csh
-# Only add the icecream directory to the PATH if we see that icecc-scheduler
-# and/or iceccd are running on this machine:
+# Only add the icecream directory to the PATH if we see that iceccd is
+# supposed to be running on this machine:
 
-setenv ICECC_PRESENT false
-/usr/bin/pgrep --ns $$ -f "^/usr/sbin/icecc-scheduler" > /dev/null
-if ( $? == 0 ) then
-  setenv ICECC_PRESENT true
-endif
-
-/usr/bin/pgrep --ns $$ -f "^/usr/sbin/iceccd" > /dev/null
-if ( $? == 0 ) then
-  setenv ICECC_PRESENT true
-endif
-
-if ( $ICECC_PRESENT == true ) then
+if ( -x /etc/rc.d/rc.iceccd ) then
   setenv PATH /usr/libexec/icecc/bin:${PATH}
 endif
-
diff --git a/source/d/icecream/icecream.sh b/source/d/icecream/icecream.sh
index 5e0afd573..824a7afb9 100644
--- a/source/d/icecream/icecream.sh
+++ b/source/d/icecream/icecream.sh
@@ -1,10 +1,7 @@
 #!/bin/sh
-# Only add the icecream directory to the PATH if we see that icecc-scheduler
-# and/or iceccd are running on this machine:
+# Only add the icecream directory to the PATH if we see that iceccd is
+# supposed to be running on this machine:
 
-if /usr/bin/pgrep --ns $$ -f "^/usr/sbin/icecc-scheduler" > /dev/null ; then
-  export PATH=/usr/libexec/icecc/bin:$PATH
-elif /usr/bin/pgrep --ns $$ -f "^/usr/sbin/iceccd" > /dev/null ; then
+if [ -x /etc/rc.d/rc.iceccd ]; then
   export PATH=/usr/libexec/icecc/bin:$PATH
 fi
-
-- 
cgit v1.2.3