wine script: add broken xargs detecting

diff --git a/etersoft/scripts/wine.in b/etersoft/scripts/wine.in
index 8b2be67a4d99c55d3e971c9802fbc83f7c636b05..3880ea1cbbd0336e152ed83ef73e9447210cb49e 100644 (file)
--- a/etersoft/scripts/wine.in
+++ b/etersoft/scripts/wine.in
@@ -255,8 +255,8 @@ update_wine()
        # Copy .reg files to CROOT (if writable)
        if [ -w "$CROOT/$INFDIR/" ] ; then
                # Apply additional reg files from /etc
-               ls -1 ${WINECONFDIR}/reg.d/*.reg 2>/dev/null | sort | xargs --no-run-if-empty cat > "${CROOT}/$INFDIR/vendor.reg"
-               ls -1 ${WINECONFDIR}/reg.d/*.reg.after 2>/dev/null | sort | xargs --no-run-if-empty cat > "${CROOT}/$INFDIR/vendor_after.reg"
+               find ${WINECONFDIR}/reg.d -maxdepth 1 -name "*.reg" | sort | xargs --no-run-if-empty cat > "${CROOT}/$INFDIR/vendor.reg" || fatal "Can't collate registry. Possible xargs is broken."
+               find ${WINECONFDIR}/reg.d -maxdepth 1 -name "*.reg.after" | sort | xargs --no-run-if-empty cat > "${CROOT}/$INFDIR/vendor_after.reg" || fatal "Can't collate registry. Possible xargs is broken."
        fi
 
        # Copying from datadir if we have some prepared tree there
@@ -264,8 +264,8 @@ update_wine()
                echo "Copying prepared tree from '${WINEDATADIR}/skel' ..."
                XARGS="xargs -IQQQ"
                echo | $XARGS 2>/dev/null || XARGS="xargs -iQQQ"
-               find ./ -type d | $XARGS $INSTALL -m 2775 -d "${CROOT}/QQQ" 2>/dev/null
-               find ./ -type f | $XARGS ln -sf "${WINEDATADIR}/skel/QQQ" "${CROOT}/QQQ" 2>/dev/null
+               find ./ -type d | $XARGS $INSTALL -m 2775 -d "${CROOT}/QQQ" || fatal "Can't copy libraries. Possible xargs is broken."
+               find ./ -type f | $XARGS ln -sf "${WINEDATADIR}/skel/QQQ" "${CROOT}/QQQ" || fatal "Can't copy libraries. Possible xargs is broken."
                #chmod a+x ${CROOT}/windows/command/* 2>/dev/null
                #chmod a+x ${CROOT}/windows/system32/*.exe 2>/dev/null
                #find ./ -type f | $XARGS ln "QQQ" "${CROOT}/QQQ" 2>/dev/null