Merge pull request #22 from stgraber/pr14

Move some initial commands to cmd/
lxc · Aug 4, 2023 · 4487ce8 · 4487ce8
2 parents 8a7cf08 + 1cdec89
commit 4487ce8
Show file tree

Hide file tree

Showing 22 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -272,7 +272,7 @@ jobs:
         env:
           CGO_ENABLED: 0
         run: |
-          go build -o bin ./incus-migrate
+          go build -o bin ./cmd/incus-migrate
 
       - name: Unit tests (client)
         env:

diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ ifeq "$(TAG_SQLITE3)" ""
 endif
 
 	CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./...
-	CGO_ENABLED=0 go install -v -tags netgo ./incus-migrate
+	CGO_ENABLED=0 go install -v -tags netgo ./cmd/incus-migrate
 	CGO_ENABLED=0 go install -v -tags agent,netgo ./incus-agent
 	@echo "Incus built successfully"
 
@@ -47,7 +47,7 @@ incus-agent:
 
 .PHONY: incus-migrate
 incus-migrate:
-	CGO_ENABLED=0 go install -v -tags netgo ./incus-migrate
+	CGO_ENABLED=0 go install -v -tags netgo ./cmd/incus-migrate
 	@echo "Incus migration tool built successfully"
 
 .PHONY: incus-doc
@@ -158,7 +158,7 @@ ifeq "$(TAG_SQLITE3)" ""
 endif
 
 	CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -v -tags "$(TAG_SQLITE3) logdebug" $(DEBUG) ./...
-	CGO_ENABLED=0 go install -v -tags "netgo,logdebug" ./incus-migrate
+	CGO_ENABLED=0 go install -v -tags "netgo,logdebug" ./cmd/incus-migrate
 	CGO_ENABLED=0 go install -v -tags "agent,netgo,logdebug" ./incus-agent
 	@echo "Incus built successfully"
 
@@ -170,7 +170,7 @@ ifeq "$(TAG_SQLITE3)" ""
 endif
 
 	CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -a -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./...
-	CGO_ENABLED=0 go install -a -v -tags netgo ./incus-migrate
+	CGO_ENABLED=0 go install -a -v -tags netgo ./cmd/incus-migrate
 	CGO_ENABLED=0 go install -a -v -tags agent,netgo ./incus-agent
 	@echo "Incus built successfully"
 
@@ -181,7 +181,7 @@ ifeq "$(TAG_SQLITE3)" ""
 endif
 
 	CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -race -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./...
-	CGO_ENABLED=0 go install -v -tags netgo ./incus-migrate
+	CGO_ENABLED=0 go install -v -tags netgo ./cmd/incus-migrate
 	CGO_ENABLED=0 go install -v -tags agent,netgo ./incus-agent
 	@echo "Incus built successfully"
 

diff --git a/fuidshift/main.go → cmd/fuidshift/main.go b/fuidshift/main.go → cmd/fuidshift/main.go
diff --git a/fuidshift/main_shift.go → cmd/fuidshift/main_shift.go b/fuidshift/main_shift.go → cmd/fuidshift/main_shift.go
diff --git a/incus-migrate/cgo.go → cmd/incus-migrate/cgo.go b/incus-migrate/cgo.go → cmd/incus-migrate/cgo.go
diff --git a/incus-migrate/main.go → cmd/incus-migrate/main.go b/incus-migrate/main.go → cmd/incus-migrate/main.go
diff --git a/incus-migrate/main_migrate.go → cmd/incus-migrate/main_migrate.go b/incus-migrate/main_migrate.go → cmd/incus-migrate/main_migrate.go
diff --git a/incus-migrate/main_netcat.go → cmd/incus-migrate/main_netcat.go b/incus-migrate/main_netcat.go → cmd/incus-migrate/main_netcat.go
diff --git a/incus-migrate/transfer.go → cmd/incus-migrate/transfer.go b/incus-migrate/transfer.go → cmd/incus-migrate/transfer.go
diff --git a/incus-migrate/utils.go → cmd/incus-migrate/utils.go b/incus-migrate/utils.go → cmd/incus-migrate/utils.go
diff --git a/incus-user/incus.go → cmd/incus-user/incus.go b/incus-user/incus.go → cmd/incus-user/incus.go
diff --git a/incus-user/main.go → cmd/incus-user/main.go b/incus-user/main.go → cmd/incus-user/main.go
diff --git a/incus-user/main_daemon.go → cmd/incus-user/main_daemon.go b/incus-user/main_daemon.go → cmd/incus-user/main_daemon.go
diff --git a/incus-user/proxy.go → cmd/incus-user/proxy.go b/incus-user/proxy.go → cmd/incus-user/proxy.go
diff --git a/lxc-to-incus/config.go → cmd/lxc-to-incus/config.go b/lxc-to-incus/config.go → cmd/lxc-to-incus/config.go
diff --git a/lxc-to-incus/main.go → cmd/lxc-to-incus/main.go b/lxc-to-incus/main.go → cmd/lxc-to-incus/main.go
diff --git a/lxc-to-incus/main_migrate.go → cmd/lxc-to-incus/main_migrate.go b/lxc-to-incus/main_migrate.go → cmd/lxc-to-incus/main_migrate.go
diff --git a/lxc-to-incus/main_migrate_test.go → cmd/lxc-to-incus/main_migrate_test.go b/lxc-to-incus/main_migrate_test.go → cmd/lxc-to-incus/main_migrate_test.go
diff --git a/lxc-to-incus/main_netcat.go → cmd/lxc-to-incus/main_netcat.go b/lxc-to-incus/main_netcat.go → cmd/lxc-to-incus/main_netcat.go
diff --git a/lxc-to-incus/network.go → cmd/lxc-to-incus/network.go b/lxc-to-incus/network.go → cmd/lxc-to-incus/network.go
diff --git a/lxc-to-incus/transfer.go → cmd/lxc-to-incus/transfer.go b/lxc-to-incus/transfer.go → cmd/lxc-to-incus/transfer.go
diff --git a/lxc-to-incus/utils.go → cmd/lxc-to-incus/utils.go b/lxc-to-incus/utils.go → cmd/lxc-to-incus/utils.go