Re-organize cmd paths

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ac631387f603c94fb307209c92a8358706de150..2d65a0fcfe6bd6fa0002d2d21671ec07105b39e8 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,21 +42,21 @@ jobs:
             mkdir dist/mobius_server_darwin_amd64
             mkdir dist/mobius_server_linux_arm
 
-            cd server
+            cd cmd/server
 
-            cp -r mobius/config ../dist/mobius_server_linux_amd64/config
-            cp -r mobius/config ../dist/mobius_server_darwin_amd64/config
-            cp -r mobius/config ../dist/mobius_server_linux_arm/config
+            cp -r mobius/config ../../dist/mobius_server_linux_amd64/config
+            cp -r mobius/config ../../dist/mobius_server_darwin_amd64/config
+            cp -r mobius/config ../../dist/mobius_server_linux_arm/config
 
-            gox -os="linux" -arch="amd64" -output="../dist/mobius_server_linux_amd64/mobius_server"
-            gox -os="darwin" -arch="amd64" -output="../dist/mobius_server_darwin_amd64/mobius_server"
-            gox -os="linux" -arch="arm" -output="../dist/mobius_server_linux_arm/mobius_server"
+            gox -os="linux" -arch="amd64" -output="../../dist/mobius_server_linux_amd64/mobius_server"
+            gox -os="darwin" -arch="amd64" -output="../../dist/mobius_server_darwin_amd64/mobius_server"
+            gox -os="linux" -arch="arm" -output="../../dist/mobius_server_linux_arm/mobius_server"
 
             cd ../client
-            gox -os="linux" -arch="amd64" -output="../dist/mobius_client_linux_amd64/mobius_client"
-            gox -os="darwin" -arch="amd64" -output="../dist/mobius_client_darwin_amd64/mobius_client"
-            cd ../dist
+            gox -os="linux" -arch="amd64" -output="../../dist/mobius_client_linux_amd64/mobius_client"
+            gox -os="darwin" -arch="amd64" -output="../../dist/mobius_client_darwin_amd64/mobius_client"
 
+            cd ../../dist
             tar -zcvf mobius_server_linux_amd64.tar.gz mobius_server_linux_amd64
             tar -zcvf mobius_server_darwin_amd64.tar.gz mobius_server_darwin_amd64
             tar -zcvf mobius_server_linux_arm.tar.gz mobius_server_linux_arm

diff --git a/client/main.go b/cmd/mobius-hotline-client/main.go
similarity index 100%
rename from client/main.go
rename to cmd/mobius-hotline-client/main.go

diff --git a/client/mobius-client-config.yaml b/cmd/mobius-hotline-client/mobius-client-config.yaml
similarity index 100%
rename from client/mobius-client-config.yaml
rename to cmd/mobius-hotline-client/mobius-client-config.yaml

diff --git a/client/mobius-hotline-server.service b/cmd/mobius-hotline-client/mobius-hotline-server.service
similarity index 100%
rename from client/mobius-hotline-server.service
rename to cmd/mobius-hotline-client/mobius-hotline-server.service

diff --git a/server/main.go b/cmd/mobius-hotline-server/main.go
similarity index 100%
rename from server/main.go
rename to cmd/mobius-hotline-server/main.go

diff --git a/server/mobius/config/Agreement.txt b/cmd/mobius-hotline-server/mobius/config/Agreement.txt
similarity index 100%
rename from server/mobius/config/Agreement.txt
rename to cmd/mobius-hotline-server/mobius/config/Agreement.txt

diff --git a/server/mobius/config/Files/hello.txt b/cmd/mobius-hotline-server/mobius/config/Files/hello.txt
similarity index 100%
rename from server/mobius/config/Files/hello.txt
rename to cmd/mobius-hotline-server/mobius/config/Files/hello.txt

diff --git a/server/mobius/config/MessageBoard.txt b/cmd/mobius-hotline-server/mobius/config/MessageBoard.txt
similarity index 100%
rename from server/mobius/config/MessageBoard.txt
rename to cmd/mobius-hotline-server/mobius/config/MessageBoard.txt

diff --git a/server/mobius/config/ThreadedNews.yaml b/cmd/mobius-hotline-server/mobius/config/ThreadedNews.yaml
similarity index 100%
rename from server/mobius/config/ThreadedNews.yaml
rename to cmd/mobius-hotline-server/mobius/config/ThreadedNews.yaml

diff --git a/server/mobius/config/Users/admin.yaml b/cmd/mobius-hotline-server/mobius/config/Users/admin.yaml
similarity index 100%
rename from server/mobius/config/Users/admin.yaml
rename to cmd/mobius-hotline-server/mobius/config/Users/admin.yaml

diff --git a/server/mobius/config/Users/guest.yaml b/cmd/mobius-hotline-server/mobius/config/Users/guest.yaml
similarity index 100%
rename from server/mobius/config/Users/guest.yaml
rename to cmd/mobius-hotline-server/mobius/config/Users/guest.yaml

diff --git a/server/mobius/config/config.yaml b/cmd/mobius-hotline-server/mobius/config/config.yaml
similarity index 100%
rename from server/mobius/config/config.yaml
rename to cmd/mobius-hotline-server/mobius/config/config.yaml