Reorganize cmd directory

t2bot · Nov 20, 2023 · d2bafc3 · d2bafc3
1 parent 8998837
commit d2bafc3
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
       - name: "Install libheif"
         run: "chmod +x ./.github/workflows/build-libheif.sh && ./.github/workflows/build-libheif.sh"
       - name: "Prepare: compile assets"
-        run: "GOBIN=$PWD/bin go install -v ./cmd/compile_assets"
+        run: "GOBIN=$PWD/bin go install -v ./cmd/utilities/compile_assets"
       - name: "Run: compile assets"
         run: "$PWD/bin/compile_assets"
       - name: "Prepare: staticcheck"
@@ -40,7 +40,7 @@ jobs:
         with:
           go-version: '1.20'
       - name: "Prepare: compile assets"
-        run: "GOBIN=$PWD/bin go install -v ./cmd/compile_assets"
+        run: "GOBIN=$PWD/bin go install -v ./cmd/utilities/compile_assets"
       - name: "Run: compile assets"
         run: "$PWD/bin/compile_assets"
       - name: "Run: tests"

diff --git a/build-dist.sh b/build-dist.sh
@@ -5,7 +5,7 @@ set -ex
 rm -rfv $PWD/bin/*
 mkdir $PWD/bin/dist
 
-GOBIN=$PWD/bin go install -v ./cmd/compile_assets
+GOBIN=$PWD/bin go install -v ./cmd/utilities/compile_assets
 $PWD/bin/compile_assets
 
 arches=("amd64")
@@ -18,7 +18,7 @@ do
     pth="$os-$arch"
     mkdir $PWD/bin/$pth
     GOOS=$os GOARCH=$arch GOBIN=$PWD/bin go build -o $PWD/bin/$pth -a -ldflags "-X github.com/turt2live/matrix-media-repo/common/version.Version=$(git describe --tags)" -v ./cmd/...
-    GOOS=$os GOARCH=$arch GOBIN=$PWD/bin go build -pgo=pgo_media_repo.pprof -o $PWD/bin/$pth -a -ldflags "-X github.com/turt2live/matrix-media-repo/common/version.Version=$(git describe --tags)" -v ./cmd/media_repo
+    GOOS=$os GOARCH=$arch GOBIN=$PWD/bin go build -pgo=pgo_media_repo.pprof -o $PWD/bin/$pth -a -ldflags "-X github.com/turt2live/matrix-media-repo/common/version.Version=$(git describe --tags)" -v ./cmd/workers/media_repo
     cd $PWD/bin/$pth
     if [ "$arch" == "amd64" ]; then
       arch="x64"

diff --git a/build.sh b/build.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-GOBIN=$PWD/bin go install -v ./cmd/compile_assets
+GOBIN=$PWD/bin go install -v ./cmd/utilities/compile_assets
 $PWD/bin/compile_assets
 GOBIN=$PWD/bin go install -ldflags "-X github.com/turt2live/matrix-media-repo/common/version.Version=$(git describe --tags)" -v ./cmd/...
-GOBIN=$PWD/bin go install -pgo=pgo_media_repo.pprof -ldflags "-X github.com/turt2live/matrix-media-repo/common/version.Version=$(git describe --tags)" -v ./cmd/media_repo
+GOBIN=$PWD/bin go install -pgo=pgo_media_repo.pprof -ldflags "-X github.com/turt2live/matrix-media-repo/common/version.Version=$(git describe --tags)" -v ./cmd/workers/media_repo
diff --git a/cmd/gdpr_export/main.go → cmd/archival/gdpr_export/main.go b/cmd/gdpr_export/main.go → cmd/archival/gdpr_export/main.go
diff --git a/cmd/gdpr_import/main.go → cmd/archival/gdpr_import/main.go b/cmd/gdpr_import/main.go → cmd/archival/gdpr_import/main.go
diff --git a/cmd/import_synapse/main.go → ...ver_live_importers/import_synapse/main.go b/cmd/import_synapse/main.go → ...ver_live_importers/import_synapse/main.go
diff --git a/cmd/export_synapse_for_import/main.go → ...porters/export_synapse_for_import/main.go b/cmd/export_synapse_for_import/main.go → ...porters/export_synapse_for_import/main.go
diff --git a/cmd/plugin_antispam_ocr/main.go → cmd/plugins/plugin_antispam_ocr/main.go b/cmd/plugin_antispam_ocr/main.go → cmd/plugins/plugin_antispam_ocr/main.go
diff --git a/cmd/compile_assets/main.go → cmd/utilities/compile_assets/main.go b/cmd/compile_assets/main.go → cmd/utilities/compile_assets/main.go
diff --git a/cmd/s3_consistency_check/main.go → cmd/utilities/s3_consistency_check/main.go b/cmd/s3_consistency_check/main.go → cmd/utilities/s3_consistency_check/main.go
diff --git a/cmd/media_repo/main.go → cmd/workers/media_repo/main.go b/cmd/media_repo/main.go → cmd/workers/media_repo/main.go
diff --git a/cmd/media_repo/reloads.go → cmd/workers/media_repo/reloads.go b/cmd/media_repo/reloads.go → cmd/workers/media_repo/reloads.go