summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-05 14:26:58 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-05 14:26:58 +0200
commit76c746024d8ba163e52f0f26e0bf8c20a4d69399 (patch)
treea6e67d4e993dc47891121d300b00a017739f7daf
parentf138af6494ab94ad1417a39976948287c1a4155c (diff)
downloadjenkins.debian.net-76c746024d8ba163e52f0f26e0bf8c20a4d69399.tar.xz
reproducible: replace 'ps fax|grep -v grep|grep foo' with 'pgrep -f foo'
-rwxr-xr-xbin/reproducible_maintenance.sh2
-rwxr-xr-xbin/schroot-create.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index a8ef120d..156e6b79 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -114,7 +114,7 @@ fi
# remove old and unused schroot sessions
echo "$(date -u) - Removing unused schroot sessions."
-ps fax|grep -v grep |grep "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep "schroot --directory" || schroot -e -c $i ; done
+pgrep -f "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do pgrep -f "schroot --directory" || schroot -e -c $i ; done
# to explain this:
# first, check if no process using "schroot" is running...
# then loop through all schroot sessions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index aff86ecb..9999ca60 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -187,7 +187,7 @@ cleanup_schroot_sessions() {
# FIXME: if this works well, move to _common.sh and use the same function from _maintenance.sh
local RESULT=""
for loop in $(seq 0 40) ; do
- ps fax|grep -v grep | grep -v schroot-create.sh |grep "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep -v schroot-create.sh | grep "schroot --directory" || schroot -e -c $i ; done
+ pgrep -f "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do pgrep -f "schroot --directory" || schroot -e -c $i ; done
RESULT=$(schroot --all-sessions -l)
if [ -z "$RESULT" ] ; then
echo "No schroot sessions in use atm..."