diff --git a/tests/chsh/01/run b/tests/chsh/01/run index a2f92c90..72760c26 100755 --- a/tests/chsh/01/run +++ b/tests/chsh/01/run @@ -40,7 +40,10 @@ save # restore the files on exit trap 'if [ "$?" != "0" ]; then echo "FAIL"; fi; restore' 0 -cp data/{passwd,group,shadow,gshadow,shells} /etc/ +for i in passwd group shadow gshadow shells +do + cp data/$i /etc +done echo -n "changing to a restricted shell, by root..." cp /bin/bash tmp/shell diff --git a/tests/convtools/01/run b/tests/convtools/01/run index 410d67fc..411514cc 100755 --- a/tests/convtools/01/run +++ b/tests/convtools/01/run @@ -48,8 +48,14 @@ save # restore the files on exit trap 'restore' 0 -rm -f /etc/{passwd,shadow,group,gshadow} -cp data/1/{passwd,group} /etc/ +for i in passwd group shadow gshadow +do + rm -f /etc/$i +done +for i in passwd group +do + cp data/1/$i /etc +done echo -n "pwconv " pwconv diff --git a/tests/cptools/01/run1 b/tests/cptools/01/run1 index f128eb72..26fc0440 100755 --- a/tests/cptools/01/run1 +++ b/tests/cptools/01/run1 @@ -32,7 +32,10 @@ save # restore the files on exit trap 'restore' 0 -cp data/{passwd,shadow,group,gshadow} /etc/ +for i in passwd group shadow gshadow +do + cp data/$i /etc +done lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ") lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ") diff --git a/tests/cptools/01/run2 b/tests/cptools/01/run2 index be51113a..c42238e6 100755 --- a/tests/cptools/01/run2 +++ b/tests/cptools/01/run2 @@ -32,7 +32,10 @@ save # restore the files on exit trap 'restore' 0 -cp data/{passwd,shadow,group,gshadow} /etc/ +for i in passwd group shadow gshadow +do + cp data/$i /etc +done lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ") lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ") diff --git a/tests/cptools/01/run3 b/tests/cptools/01/run3 index eee7481e..f97463ec 100755 --- a/tests/cptools/01/run3 +++ b/tests/cptools/01/run3 @@ -32,7 +32,10 @@ save # restore the files on exit trap 'restore' 0 -cp data/{passwd,shadow,group,gshadow} /etc/ +for i in passwd group shadow gshadow +do + cp data/$i /etc +done lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ") lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ") diff --git a/tests/cptools/01/run4 b/tests/cptools/01/run4 index 32f5a8ae..7cc3fb8d 100755 --- a/tests/cptools/01/run4 +++ b/tests/cptools/01/run4 @@ -32,7 +32,10 @@ save # restore the files on exit trap 'restore' 0 -cp data/{passwd,shadow,group,gshadow} /etc/ +for i in passwd group shadow gshadow +do + cp data/$i /etc +done lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ") lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")