From: Alexander Morozov <amorozov@etersoft.ru>
Date: Mon, 30 May 2011 14:40:30 +0000 (+0400)
Subject: Copy file from skel-copy directory (eterbug #5225).
X-Git-Tag: 1.3.16-alt1.1~5^2
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=c4b95e3e86bf426f76f1a0d818d7a3f37c3f2b52;p=wine%2Feterwine.git

Copy file from skel-copy directory (eterbug #5225).
---

diff --git a/etersoft/scripts/wine.in b/etersoft/scripts/wine.in
index 7ec7782c17..0930820fb4 100644
--- a/etersoft/scripts/wine.in
+++ b/etersoft/scripts/wine.in
@@ -298,19 +298,29 @@ find_type()
 }
 
 	# Copying from datadir if we have some prepared tree there
-	if [ ! "$WINEMODE" = "--attach" ] && cd ${WINEDATADIR}/skel 2>/dev/null ; then
-		echo "Copying prepared tree from '${WINEDATADIR}/skel' ..."
+	if [ ! "$WINEMODE" = "--attach" ] ; then
+		echo "Copying prepared tree from '${WINEDATADIR}/skel-copy' and '${WINEDATADIR}/skel' ..."
 		XARGS="xargs -IQQQ"
 		echo | $XARGS 2>/dev/null || XARGS="xargs -iQQQ"
-		find_type d | $XARGS $INSTALL -m 2775 -d "${CROOT}/QQQ" || fatal "Can't copy libraries. Possible xargs is broken."
 
-		# remove possible targets (for do not use unportable cp --remove-destination)
-		find_type f | $XARGS rm -f "${CROOT}/QQQ"
-		if [ -n "$WINECOPYSKEL" ] ; then
-			find_type f | $XARGS cp -f "${WINEDATADIR}/skel/QQQ" "${CROOT}/QQQ" || fatal "Can't copy skel files. Possible xargs is broken."
-		else
-			find_type f | $XARGS ln -sf "${WINEDATADIR}/skel/QQQ" "${CROOT}/QQQ" || fatal "Can't symlink skel files. Possible xargs is broken."
+		if cd ${WINEDATADIR}/skel-copy 2>/dev/null ; then
+			find_type d | $XARGS $INSTALL -m 2775 -d "${CROOT}/QQQ" || fatal "Can't copy libraries. Possible xargs is broken."
+			# remove possible targets (for do not use unportable cp --remove-destination)
+			find_type f | $XARGS rm -f "${CROOT}/QQQ"
+			find_type f | $XARGS cp -f "${WINEDATADIR}/skel-copy/QQQ" "${CROOT}/QQQ" || fatal "Can't copy skel files. Possible xargs is broken."
 		fi
+
+		if cd ${WINEDATADIR}/skel 2>/dev/null ; then
+			find_type d | $XARGS $INSTALL -m 2775 -d "${CROOT}/QQQ" || fatal "Can't copy libraries. Possible xargs is broken."
+			# remove possible targets (for do not use unportable cp --remove-destination)
+			find_type f | $XARGS rm -f "${CROOT}/QQQ"
+			if [ -n "$WINECOPYSKEL" ] ; then
+				find_type f | $XARGS cp -f "${WINEDATADIR}/skel/QQQ" "${CROOT}/QQQ" || fatal "Can't copy skel files. Possible xargs is broken."
+			else
+				find_type f | $XARGS ln -sf "${WINEDATADIR}/skel/QQQ" "${CROOT}/QQQ" || fatal "Can't symlink skel files. Possible xargs is broken."
+			fi
+		fi
+
 		cd - >/dev/null
 	fi