diff --git a/plugins/sudoers/regress/testsudoers/test3.sh b/plugins/sudoers/regress/testsudoers/test3.sh index 3d14bd29c..ff7507e93 100755 --- a/plugins/sudoers/regress/testsudoers/test3.sh +++ b/plugins/sudoers/regress/testsudoers/test3.sh @@ -3,49 +3,44 @@ # Test @includedir facility # -parentdir="`echo $0 | sed 's:/[^/]*$::'`" -if [ -d "$parentdir" ]; then - # make sure include file is owned by current user - rm -rf "${parentdir}/test3.d" - mkdir "${parentdir}/test3.d" - cat >"${parentdir}/test3.d/root" <<-EOF - root ALL = ALL - EOF +TESTDIR="`pwd`/regress/testsudoers" +# make sure include file is owned by current user +rm -rf "$TESTDIR/test3.d" +mkdir "$TESTDIR/test3.d" +cat >"$TESTDIR/test3.d/root" <<-EOF + root ALL = ALL +EOF - MYUID=`\ls -lnd $TESTDIR/test3.d | awk '{print $3}'` - MYGID=`\ls -lnd $TESTDIR/test3.d | awk '{print $4}'` - exec 2>&1 +MYUID=`\ls -lnd $TESTDIR/test3.d | awk '{print $3}'` +MYGID=`\ls -lnd $TESTDIR/test3.d | awk '{print $4}'` +exec 2>&1 - echo "Testing @includedir of an unquoted path" - echo "" - ./testsudoers -U $MYUID -G $MYGID root id <<-EOF - @includedir $TESTDIR/test3.d - EOF +echo "Testing @includedir of an unquoted path" +echo "" +./testsudoers -U $MYUID -G $MYGID root id <<-EOF + @includedir $TESTDIR/test3.d +EOF - echo "" - echo "Testing @includedir of a double-quoted path" - echo "" - ./testsudoers -U $MYUID -G $MYGID root id <<-EOF - @includedir "$TESTDIR/test3.d" - EOF +echo "" +echo "Testing @includedir of a double-quoted path" +echo "" +./testsudoers -U $MYUID -G $MYGID root id <<-EOF + @includedir "$TESTDIR/test3.d" +EOF - echo "" - echo "Testing #includedir of an unquoted path" - echo "" - ./testsudoers -U $MYUID -G $MYGID root id <<-EOF - #includedir $TESTDIR/test3.d - EOF +echo "" +echo "Testing #includedir of an unquoted path" +echo "" +./testsudoers -U $MYUID -G $MYGID root id <<-EOF + #includedir $TESTDIR/test3.d +EOF - echo "" - echo "Testing #includedir of a double-quoted path" - echo "" - ./testsudoers -U $MYUID -G $MYGID root id <<-EOF - #includedir "$TESTDIR/test3.d" - EOF +echo "" +echo "Testing #includedir of a double-quoted path" +echo "" +./testsudoers -U $MYUID -G $MYGID root id <<-EOF + #includedir "$TESTDIR/test3.d" +EOF - rm -rf "${parentdir}/test3.d" - exit 0 -fi - -echo "$0: unable to determine parent dir" 1>&2 -exit 1 +rm -rf "$TESTDIR/test3.d" +exit 0