Filesystem: move ./resources/* into KOVRI_DATA_DIR

* Remove ./resources/
anonimal · Feb 22, 2016 · a4aa27a · a4aa27a
1 parent ab35c35
commit a4aa27a
Show file tree

Hide file tree

Showing 34 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -211,9 +211,9 @@ add_subdirectory(src)
 
 # Copy resources
 if(WITH_BINARY)
-  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pkg/resources/certificates" DESTINATION "${KOVRI_DATA_DIR}/resources/")
-  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pkg/resources/kovri.conf" DESTINATION "${KOVRI_DATA_DIR}/")
-  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pkg/resources/tunnels.cfg" DESTINATION "${KOVRI_DATA_DIR}/")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pkg/certificates" DESTINATION "${KOVRI_DATA_DIR}/")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pkg/kovri.conf" DESTINATION "${KOVRI_DATA_DIR}/")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pkg/tunnels.cfg" DESTINATION "${KOVRI_DATA_DIR}/")
 endif()
 
 # vim: noai:ts=2:sw=2
diff --git a/pkg/resources/certificates/ssl/08d065a7.0 → pkg/certificates/ssl/08d065a7.0 b/pkg/resources/certificates/ssl/08d065a7.0 → pkg/certificates/ssl/08d065a7.0
diff --git a/pkg/resources/certificates/ssl/2d6f4427.0 → pkg/certificates/ssl/2d6f4427.0 b/pkg/resources/certificates/ssl/2d6f4427.0 → pkg/certificates/ssl/2d6f4427.0
diff --git a/pkg/resources/certificates/ssl/3825be88.0 → pkg/certificates/ssl/3825be88.0 b/pkg/resources/certificates/ssl/3825be88.0 → pkg/certificates/ssl/3825be88.0
diff --git a/pkg/resources/certificates/ssl/50898483.0 → pkg/certificates/ssl/50898483.0 b/pkg/resources/certificates/ssl/50898483.0 → pkg/certificates/ssl/50898483.0
diff --git a/pkg/resources/certificates/ssl/6231bd89.0 → pkg/certificates/ssl/6231bd89.0 b/pkg/resources/certificates/ssl/6231bd89.0 → pkg/certificates/ssl/6231bd89.0
diff --git a/pkg/resources/certificates/ssl/83becdbb.0 → pkg/certificates/ssl/83becdbb.0 b/pkg/resources/certificates/ssl/83becdbb.0 → pkg/certificates/ssl/83becdbb.0
diff --git a/pkg/resources/certificates/ssl/95728221.0 → pkg/certificates/ssl/95728221.0 b/pkg/resources/certificates/ssl/95728221.0 → pkg/certificates/ssl/95728221.0
diff --git a/pkg/resources/certificates/ssl/b4870bc9.0 → pkg/certificates/ssl/b4870bc9.0 b/pkg/resources/certificates/ssl/b4870bc9.0 → pkg/certificates/ssl/b4870bc9.0
diff --git a/pkg/resources/certificates/ssl/c135798b.0 → pkg/certificates/ssl/c135798b.0 b/pkg/resources/certificates/ssl/c135798b.0 → pkg/certificates/ssl/c135798b.0
diff --git a/...ertificates/ssl/download.xxlspeed.com.crt → ...ertificates/ssl/download.xxlspeed.com.crt b/...ertificates/ssl/download.xxlspeed.com.crt → ...ertificates/ssl/download.xxlspeed.com.crt
diff --git a/pkg/resources/certificates/ssl/e165f39a.0 → pkg/certificates/ssl/e165f39a.0 b/pkg/resources/certificates/ssl/e165f39a.0 → pkg/certificates/ssl/e165f39a.0
diff --git a/...urces/certificates/ssl/i2p-0.manas.ca.crt → pkg/certificates/ssl/i2p-0.manas.ca.crt b/...urces/certificates/ssl/i2p-0.manas.ca.crt → pkg/certificates/ssl/i2p-0.manas.ca.crt
diff --git a/...sources/certificates/ssl/i2p.mooo.com.crt → pkg/certificates/ssl/i2p.mooo.com.crt b/...sources/certificates/ssl/i2p.mooo.com.crt → pkg/certificates/ssl/i2p.mooo.com.crt
diff --git a/...tificates/ssl/i2pseed.zarrenspry.info.crt → ...tificates/ssl/i2pseed.zarrenspry.info.crt b/...tificates/ssl/i2pseed.zarrenspry.info.crt → ...tificates/ssl/i2pseed.zarrenspry.info.crt
diff --git a/...ources/certificates/ssl/netdb.i2p2.no.crt → pkg/certificates/ssl/netdb.i2p2.no.crt b/...ources/certificates/ssl/netdb.i2p2.no.crt → pkg/certificates/ssl/netdb.i2p2.no.crt
diff --git a/...ertificates/ssl/reseed.i2p-projekt.de.crt → ...ertificates/ssl/reseed.i2p-projekt.de.crt b/...ertificates/ssl/reseed.i2p-projekt.de.crt → ...ertificates/ssl/reseed.i2p-projekt.de.crt
diff --git a/...certificates/ssl/reseed.i2p.vzaws.com.crt → ...certificates/ssl/reseed.i2p.vzaws.com.crt b/...certificates/ssl/reseed.i2p.vzaws.com.crt → ...certificates/ssl/reseed.i2p.vzaws.com.crt
diff --git a/...es/certificates/ssl/uk.reseed.i2p2.no.crt → pkg/certificates/ssl/uk.reseed.i2p2.no.crt b/...es/certificates/ssl/uk.reseed.i2p2.no.crt → pkg/certificates/ssl/uk.reseed.i2p2.no.crt
diff --git a/...es/certificates/ssl/us.reseed.i2p2.no.crt → pkg/certificates/ssl/us.reseed.i2p2.no.crt b/...es/certificates/ssl/us.reseed.i2p2.no.crt → pkg/certificates/ssl/us.reseed.i2p2.no.crt
diff --git a/...sources/certificates/ssl/user.mx24.eu.crt → pkg/certificates/ssl/user.mx24.eu.crt b/...sources/certificates/ssl/user.mx24.eu.crt → pkg/certificates/ssl/user.mx24.eu.crt
diff --git a/...s/certificates/su3/backup_at_mail.i2p.crt → pkg/certificates/su3/backup_at_mail.i2p.crt b/...s/certificates/su3/backup_at_mail.i2p.crt → pkg/certificates/su3/backup_at_mail.i2p.crt
diff --git a/...es/certificates/su3/bugme_at_mail.i2p.crt → pkg/certificates/su3/bugme_at_mail.i2p.crt b/...es/certificates/su3/bugme_at_mail.i2p.crt → pkg/certificates/su3/bugme_at_mail.i2p.crt
diff --git a/...rtificates/su3/cheezybudz_at_mail.i2p.crt → ...rtificates/su3/cheezybudz_at_mail.i2p.crt b/...rtificates/su3/cheezybudz_at_mail.i2p.crt → ...rtificates/su3/cheezybudz_at_mail.i2p.crt
diff --git a/.../certificates/su3/echelon_at_mail.i2p.crt → pkg/certificates/su3/echelon_at_mail.i2p.crt b/.../certificates/su3/echelon_at_mail.i2p.crt → pkg/certificates/su3/echelon_at_mail.i2p.crt
diff --git a/...rtificates/su3/j_at_torontocrypto.org.crt → ...rtificates/su3/j_at_torontocrypto.org.crt b/...rtificates/su3/j_at_torontocrypto.org.crt → ...rtificates/su3/j_at_torontocrypto.org.crt
diff --git a/...ertificates/su3/matt_at_drollette.com.crt → ...ertificates/su3/matt_at_drollette.com.crt b/...ertificates/su3/matt_at_drollette.com.crt → ...ertificates/su3/matt_at_drollette.com.crt
diff --git a/...ces/certificates/su3/meeh_at_mail.i2p.crt → pkg/certificates/su3/meeh_at_mail.i2p.crt b/...ces/certificates/su3/meeh_at_mail.i2p.crt → pkg/certificates/su3/meeh_at_mail.i2p.crt
diff --git a/...ces/certificates/su3/parg_at_mail.i2p.crt → pkg/certificates/su3/parg_at_mail.i2p.crt b/...ces/certificates/su3/parg_at_mail.i2p.crt → pkg/certificates/su3/parg_at_mail.i2p.crt
diff --git a/...rces/certificates/su3/zmx_at_mail.i2p.crt → pkg/certificates/su3/zmx_at_mail.i2p.crt b/...rces/certificates/su3/zmx_at_mail.i2p.crt → pkg/certificates/su3/zmx_at_mail.i2p.crt
diff --git a/pkg/resources/kovri.conf → pkg/kovri.conf b/pkg/resources/kovri.conf → pkg/kovri.conf
diff --git a/pkg/resources/tunnels.cfg → pkg/tunnels.cfg b/pkg/resources/tunnels.cfg → pkg/tunnels.cfg
diff --git a/src/app/util/Filesystem.cpp b/src/app/util/Filesystem.cpp
@@ -68,11 +68,11 @@ bfs::path GetTunnelsConfigFile() {
 }
 
 bfs::path GetSU3CertsPath() {
-  return GetDataPath() / "resources" / "certificates" / "su3";
+  return GetDataPath() / "certificates" / "su3";
 }
 
 bfs::path GetSSLCertsPath() {
-  return GetDataPath() / "resources" / "certificates" / "ssl";
+  return GetDataPath() / "certificates" / "ssl";
 }
 
 std::string GetFullPath(

diff --git a/src/core/util/Filesystem.cpp b/src/core/util/Filesystem.cpp
@@ -42,11 +42,11 @@ namespace filesystem {
 namespace bfs = boost::filesystem;
 
 bfs::path GetSU3CertsPath() {
-  return i2p::context.GetDataPath() / "resources" / "certificates" / "su3";
+  return i2p::context.GetDataPath() / "certificates" / "su3";
 }
 
 bfs::path GetSSLCertsPath() {
-  return i2p::context.GetDataPath() / "resources" / "certificates" / "ssl";
+  return i2p::context.GetDataPath() / "certificates" / "ssl";
 }
 
 std::string GetFullPath(const std::string& filename) {