Skip to content

Commit 4ef7512

Browse files
kdumontnukdumontnu
authored
put ${CURDIR} in quotes to prevent make from splitting paths with spaces into separate strings (#14056)
1 parent 4cd94e3 commit 4ef7512

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

‎Makefile

+21-21
Original file line numberDiff line numberDiff line change
@@ -389,15 +389,15 @@ generate-ini-sqlite:
389389

390390
.PHONY: test-sqlite
391391
test-sqlite: integrations.sqlite.test generate-ini-sqlite
392-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test
392+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test
393393

394394
.PHONY: test-sqlite\#%
395395
test-sqlite\#%: integrations.sqlite.test generate-ini-sqlite
396-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*)
396+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*)
397397

398398
.PHONY: test-sqlite-migration
399399
test-sqlite-migration: migrations.sqlite.test generate-ini-sqlite
400-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test
400+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./migrations.sqlite.test
401401

402402
generate-ini-mysql:
403403
sed -e 's|{{TEST_MYSQL_HOST}}|${TEST_MYSQL_HOST}|g' \
@@ -409,15 +409,15 @@ generate-ini-mysql:
409409

410410
.PHONY: test-mysql
411411
test-mysql: integrations.mysql.test generate-ini-mysql
412-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test
412+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test
413413

414414
.PHONY: test-mysql\#%
415415
test-mysql\#%: integrations.mysql.test generate-ini-mysql
416-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*)
416+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*)
417417

418418
.PHONY: test-mysql-migration
419419
test-mysql-migration: migrations.mysql.test generate-ini-mysql
420-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./migrations.mysql.test
420+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./migrations.mysql.test
421421

422422
generate-ini-mysql8:
423423
sed -e 's|{{TEST_MYSQL8_HOST}}|${TEST_MYSQL8_HOST}|g' \
@@ -429,15 +429,15 @@ generate-ini-mysql8:
429429

430430
.PHONY: test-mysql8
431431
test-mysql8: integrations.mysql8.test generate-ini-mysql8
432-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test
432+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test
433433

434434
.PHONY: test-mysql8\#%
435435
test-mysql8\#%: integrations.mysql8.test generate-ini-mysql8
436-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test -test.run $(subst .,/,$*)
436+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./integrations.mysql8.test -test.run $(subst .,/,$*)
437437

438438
.PHONY: test-mysql8-migration
439439
test-mysql8-migration: migrations.mysql8.test generate-ini-mysql8
440-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql8.ini ./migrations.mysql8.test
440+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql8.ini ./migrations.mysql8.test
441441

442442
generate-ini-pgsql:
443443
sed -e 's|{{TEST_PGSQL_HOST}}|${TEST_PGSQL_HOST}|g' \
@@ -450,15 +450,15 @@ generate-ini-pgsql:
450450

451451
.PHONY: test-pgsql
452452
test-pgsql: integrations.pgsql.test generate-ini-pgsql
453-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test
453+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test
454454

455455
.PHONY: test-pgsql\#%
456456
test-pgsql\#%: integrations.pgsql.test generate-ini-pgsql
457-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*)
457+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*)
458458

459459
.PHONY: test-pgsql-migration
460460
test-pgsql-migration: migrations.pgsql.test generate-ini-pgsql
461-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./migrations.pgsql.test
461+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./migrations.pgsql.test
462462

463463
generate-ini-mssql:
464464
sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
@@ -470,35 +470,35 @@ generate-ini-mssql:
470470

471471
.PHONY: test-mssql
472472
test-mssql: integrations.mssql.test generate-ini-mssql
473-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test
473+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test
474474

475475
.PHONY: test-mssql\#%
476476
test-mssql\#%: integrations.mssql.test generate-ini-mssql
477-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.run $(subst .,/,$*)
477+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.run $(subst .,/,$*)
478478

479479
.PHONY: test-mssql-migration
480480
test-mssql-migration: migrations.mssql.test generate-ini-mssql
481-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./migrations.mssql.test -test.failfast
481+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./migrations.mssql.test -test.failfast
482482

483483
.PHONY: bench-sqlite
484484
bench-sqlite: integrations.sqlite.test generate-ini-sqlite
485-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
485+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
486486

487487
.PHONY: bench-mysql
488488
bench-mysql: integrations.mysql.test generate-ini-mysql
489-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
489+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
490490

491491
.PHONY: bench-mssql
492492
bench-mssql: integrations.mssql.test generate-ini-mssql
493-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
493+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mssql.ini ./integrations.mssql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
494494

495495
.PHONY: bench-pgsql
496496
bench-pgsql: integrations.pgsql.test generate-ini-pgsql
497-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
497+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .
498498

499499
.PHONY: integration-test-coverage
500500
integration-test-coverage: integrations.cover.test generate-ini-mysql
501-
GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
501+
GITEA_ROOT="$(CURDIR)" GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
502502

503503
integrations.mysql.test: git-check $(GO_SOURCES)
504504
$(GO) test $(GOTESTFLAGS) -mod=vendor -c code.gitea.io/gitea/integrations -o integrations.mysql.test
@@ -720,7 +720,7 @@ docker:
720720

721721
.PHONY: docker-build
722722
docker-build:
723-
docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build
723+
docker run -ti --rm -v "$(CURDIR):/srv/app/src/code.gitea.io/gitea" -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" LDFLAGS="$(LDFLAGS)" CGO_EXTRA_CFLAGS="$(CGO_EXTRA_CFLAGS)" webhippie/golang:edge make clean build
724724

725725
# This endif closes the if at the top of the file
726726
endif

0 commit comments

Comments
 (0)