-mkdir $FROM/$LONGNAME || test_skipped "unable to create long directory"
-makepath ${LONGDIR}
-date > ${LONGDIR}/1
-ls -la / > ${LONGDIR}/2
-checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}
+makepath "$longdir" || test_skipped "unable to create long directory"
+touch "$longdir/1" || test_skipped "unable to create files in long directory"
+date > "$longdir/1"
+if [ -r /etc ]; then
+ ls -la /etc >"$longdir/2"
+else
+ ls -la / >"$longdir/2"
+fi
+checkit "$RSYNC --delete -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0