[Pkg-shadow-commits] r3243 - debian/trunk/tests/usertools/55_userdel_busy_user

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-08-26 19:36:43 +0000 (Thu, 26 Aug 2010)
New Revision: 3243

Modified:
   debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test
Log:
Support for dash.


Modified: debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test
===================================================================
--- debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test	2010-08-26 19:34:04 UTC (rev 3242)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test	2010-08-26 19:36:43 UTC (rev 3243)
@@ -12,7 +12,7 @@
 save_config
 
 # restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config; kill %1' 0
+trap 'log_status "$0" "FAILURE"; restore_config; kill $pid' 0
 
 change_config
 
@@ -25,7 +25,9 @@
 
 echo -n "Delete user foo (userdel foo)..."
 userdel foo 2>tmp/userdel.err && exit 1 || {
-	status=$?
+	ps=$(echo $! $?)
+	pid=$(echo $ps | cut -f1 -d' ')
+	status=$(echo $ps | cut -f2 -d' ')
 }
 echo "OK"
 
@@ -42,9 +44,10 @@
 echo "error message OK."
 rm -f tmp/userdel.err
 
-kill %1 || true
-wait %1 || true
 
+kill $pid || true
+wait || true
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"