summaryrefslogtreecommitdiffstats
path: root/source/d/icecream
diff options
context:
space:
mode:
Diffstat (limited to 'source/d/icecream')
-rwxr-xr-xsource/d/icecream/icecream.SlackBuild2
-rw-r--r--source/d/icecream/icecream.csh18
-rw-r--r--source/d/icecream/icecream.sh9
3 files changed, 7 insertions, 22 deletions
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
-