From 9754fdc7bff81a0deb027fd2530d77aa4ab68b7a Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Thu, 24 Dec 2020 12:12:07 +0100
Subject: [PATCH] Restructure a bit

---
 NvimView/.gitignore                                         | 4 ++--
 NvimView/Package.swift                                      | 6 +++---
 .../NvimView/{ => Resources}/com.qvacua.NvimView.vim        | 0
 bin/build_nvimserver_for_local_dev.sh                       | 6 +++---
 bin/download_nvimserver.sh                                  | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename NvimView/Sources/NvimView/{ => Resources}/com.qvacua.NvimView.vim (100%)

diff --git a/NvimView/.gitignore b/NvimView/.gitignore
index 5973051f..3bf4fdab 100644
--- a/NvimView/.gitignore
+++ b/NvimView/.gitignore
@@ -4,5 +4,5 @@
 /*.xcodeproj
 xcuserdata/
 
-Sources/NvimView/runtime
-Sources/NvimView/NvimServer
+Sources/NvimView/Resources/runtime
+Sources/NvimView/Resources/NvimServer
diff --git a/NvimView/Package.swift b/NvimView/Package.swift
index 314fe5cd..cc3fad3c 100644
--- a/NvimView/Package.swift
+++ b/NvimView/Package.swift
@@ -26,10 +26,10 @@ let package = Package(
       name: "NvimView",
       dependencies: ["RxSwift", "RxPack", "Tabs", "NvimServerTypes", "MessagePack", "Commons"],
       // com.qvacua.NvimView.vim is copied by the download NvimServer script.
-      exclude: ["com.qvacua.NvimView.vim"],
+      exclude: ["Resources/com.qvacua.NvimView.vim"],
       resources: [
-        .copy("runtime"),
-        .copy("NvimServer"),
+        .copy("Resources/runtime"),
+        .copy("Resources/NvimServer"),
       ]
     ),
     .testTarget(
diff --git a/NvimView/Sources/NvimView/com.qvacua.NvimView.vim b/NvimView/Sources/NvimView/Resources/com.qvacua.NvimView.vim
similarity index 100%
rename from NvimView/Sources/NvimView/com.qvacua.NvimView.vim
rename to NvimView/Sources/NvimView/Resources/com.qvacua.NvimView.vim
diff --git a/bin/build_nvimserver_for_local_dev.sh b/bin/build_nvimserver_for_local_dev.sh
index 09e52cb8..56cf7403 100755
--- a/bin/build_nvimserver_for_local_dev.sh
+++ b/bin/build_nvimserver_for_local_dev.sh
@@ -12,9 +12,9 @@ main() {
 
   pushd "./NvimServer"
     ./NvimServer/bin/build_nvimserver.sh
-    cp ./build/Build/Products/Release/NvimServer ../NvimView/Sources/NvimView
-    cp -r ./runtime ../NvimView/Sources/NvimView
-    cp ../NvimView/Sources/NvimView/com.qvacua.NvimView.vim ../NvimView/Sources/NvimView/runtime/plugin
+    cp ./build/Build/Products/Release/NvimServer ../NvimView/Sources/NvimView/Resources
+    cp -r ./runtime ../NvimView/Sources/NvimView/Resources
+    cp ../NvimView/Sources/NvimView/Resources/com.qvacua.NvimView.vim ../NvimView/Sources/NvimView/Resources/runtime/plugin
 
   popd >/dev/null
 
diff --git a/bin/download_nvimserver.sh b/bin/download_nvimserver.sh
index 55edc703..3ad9da44 100755
--- a/bin/download_nvimserver.sh
+++ b/bin/download_nvimserver.sh
@@ -22,9 +22,9 @@ download_nvimserver() {
   tar xf "NvimServer.tar.bz2"
   popd >/dev/null
 
-  cp -r "${nvimserver_dir_path}/NvimServer" NvimView/Sources/NvimView/
-  cp -r "${nvimserver_dir_path}/runtime" NvimView/Sources/NvimView/
-  cp NvimView/Sources/NvimView/com.qvacua.NvimView.vim NvimView/Sources/NvimView/runtime/plugin
+  cp -r "${nvimserver_dir_path}/NvimServer" NvimView/Sources/NvimView/Resources
+  cp -r "${nvimserver_dir_path}/runtime" NvimView/Sources/NvimView/Resources
+  cp NvimView/Sources/NvimView/Resources/com.qvacua.NvimView.vim NvimView/Sources/NvimView/Resources/runtime/plugin
 
   echo "### Downloaded NvimServer"
 }