From 96faf99ff3398c633c90673f9188b0fc9d16c0d1 Mon Sep 17 00:00:00 2001
From: Andrey Filipenkov <decapitator@ukr.net>
Date: Sat, 11 Jan 2020 15:57:31 +0300
Subject: [PATCH 1/2] [macos] copy files script cleanup

---
 .../darwin/Support/CopyRootFiles-osx.command  | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command
index fa4f5d5ee0f2a..0fd635680e250 100755
--- a/tools/darwin/Support/CopyRootFiles-osx.command
+++ b/tools/darwin/Support/CopyRootFiles-osx.command
@@ -19,38 +19,41 @@ SYNCSKIN="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cv
 # rsync command for including everything but the skins
 ADDONSYNC="rsync -aq --no-links --exclude .git* --exclude .DS_Store* --exclude addons/skin.estuary --exclude addons/skin.estouchy"
 
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/media"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/system"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/userdata"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/media"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin/runtime"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user"
-
-${SYNC} "$SRCROOT/LICENSE.md" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
-${SYNC} "$SRCROOT/privacy-policy.txt" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
-${SYNC} "$SRCROOT/tools/darwin/runtime"	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin"
-${ADDONSYNC} "$SRCROOT/addons"		"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-${SYNC} "$SRCROOT/media" 		"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-${SYNCSKIN} "$SRCROOT/addons/skin.estuary" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons"
-${SYNC} "$SRCROOT/addons/skin.estuary/extras" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estuary"
+BASE_TARGET_PATH="$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources"
+TARGET_PATH="$BASE_TARGET_PATH/$APP_NAME"
+
+mkdir -p "$TARGET_PATH"
+mkdir -p "$TARGET_PATH/addons"
+mkdir -p "$TARGET_PATH/media"
+mkdir -p "$TARGET_PATH/system"
+mkdir -p "$TARGET_PATH/userdata"
+mkdir -p "$TARGET_PATH/media"
+mkdir -p "$TARGET_PATH/tools/darwin/runtime"
+mkdir -p "$TARGET_PATH/extras/user"
+
+${SYNC} "$SRCROOT/LICENSE.md" "$BASE_TARGET_PATH"
+${SYNC} "$SRCROOT/privacy-policy.txt" "$TARGET_PATH"
+${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html" "$BASE_TARGET_PATH"
+${SYNC} "$SRCROOT/tools/darwin/runtime" "$TARGET_PATH/tools/darwin"
+${ADDONSYNC} "$SRCROOT/addons" "$TARGET_PATH"
+${SYNC} "$SRCROOT/media" "$TARGET_PATH"
+${SYNCSKIN} "$SRCROOT/addons/skin.estuary" "$TARGET_PATH/addons"
+${SYNC} "$SRCROOT/addons/skin.estuary/extras" "$TARGET_PATH/addons/skin.estuary"
 ${SYNC} "$SRCROOT/addons/skin.estuary/resources"   "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.estuary"
-${SYNCSKIN} "$SRCROOT/addons/skin.estouchy" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons"
-${SYNC} "$SRCROOT/addons/skin.estouchy/background" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estouchy"
-${SYNC} "$SRCROOT/addons/skin.estouchy/resources" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estouchy"
-${SYNC} "$SRCROOT/system" 		"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-${SYNC} "$SRCROOT/userdata" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
+${SYNCSKIN} "$SRCROOT/addons/skin.estouchy" "$TARGET_PATH/addons"
+${SYNC} "$SRCROOT/addons/skin.estouchy/background" "$TARGET_PATH/addons/skin.estouchy"
+${SYNC} "$SRCROOT/addons/skin.estouchy/resources" "$TARGET_PATH/addons/skin.estouchy"
+${SYNC} "$SRCROOT/system" "$TARGET_PATH"
+${SYNC} "$SRCROOT/userdata" "$TARGET_PATH"
 
 # copy extra packages if applicable
 if [ -d "$SRCROOT/extras/system" ]; then
-	${SYNC} "$SRCROOT/extras/system/" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
+  ${SYNC} "$SRCROOT/extras/system/" "$TARGET_PATH"
 fi
 
 # copy extra user packages if applicable
 if [ -d "$SRCROOT/extras/user" ]; then
-	${SYNC} "$SRCROOT/extras/user/" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user"
+  ${SYNC} "$SRCROOT/extras/user/" "$TARGET_PATH/extras/user"
 fi
 
 

From ab339d7f3ab560e37e72fd8efc88f912614904ae Mon Sep 17 00:00:00 2001
From: Andrey Filipenkov <decapitator@ukr.net>
Date: Sat, 11 Jan 2020 15:58:14 +0300
Subject: [PATCH 2/2] [macos] fix copying addons/skin.estuary/resources to app
 package

---
 tools/darwin/Support/CopyRootFiles-osx.command | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command
index 0fd635680e250..76250ea03546d 100755
--- a/tools/darwin/Support/CopyRootFiles-osx.command
+++ b/tools/darwin/Support/CopyRootFiles-osx.command
@@ -39,7 +39,7 @@ ${ADDONSYNC} "$SRCROOT/addons" "$TARGET_PATH"
 ${SYNC} "$SRCROOT/media" "$TARGET_PATH"
 ${SYNCSKIN} "$SRCROOT/addons/skin.estuary" "$TARGET_PATH/addons"
 ${SYNC} "$SRCROOT/addons/skin.estuary/extras" "$TARGET_PATH/addons/skin.estuary"
-${SYNC} "$SRCROOT/addons/skin.estuary/resources"   "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.estuary"
+${SYNC} "$SRCROOT/addons/skin.estuary/resources" "$TARGET_PATH/addons/skin.estuary"
 ${SYNCSKIN} "$SRCROOT/addons/skin.estouchy" "$TARGET_PATH/addons"
 ${SYNC} "$SRCROOT/addons/skin.estouchy/background" "$TARGET_PATH/addons/skin.estouchy"
 ${SYNC} "$SRCROOT/addons/skin.estouchy/resources" "$TARGET_PATH/addons/skin.estouchy"