echo Starting server node...
-$tinc -n netname $c1 start $r1
+$tinc $c1 -n netname start $r1
echo foo-started >>$OUT
echo Inviting client node...
-url=`$tinc -n netname2 $c1 invite bar | sed 's/\r//'`
+url=`$tinc $c1 -n netname2 invite bar | tr -d '\r'`
file=`cd $d1/invitations; ls | grep -v ed25519_key.priv`
echo bar-invited >>$OUT
echo Joining client node...
-$tinc -n netname3 $c2 join $url
+$tinc $c2 -n netname3 join $url
echo bar-joined >>$OUT
# Start and stop client node
tinc-down netname,foo,dummy,,,,,,,,,5
EOF
-sed -i 's/\r//' $OUT
-cmp $OUT $OUT.expected
+tr -d '\r' <$OUT >$OUT.actual
+
+cmp $OUT.actual $OUT.expected