Browse Source

Fies #6468 - Uses space match and adds newline for all sed flavors (#6473)

tags/v1.21.12.1
Richard Mahn Lunny Xiao 6 years ago
parent
commit
4e3ce71ac9
2 changed files with 5 additions and 3 deletions
  1. +4
    -2
      Makefile
  2. +1
    -1
      templates/swagger/v1_json.tmpl

+ 4
- 2
Makefile View File

@@ -46,8 +46,9 @@ TAGS ?=
TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'gitea-temp')

SWAGGER_SPEC := templates/swagger/v1_json.tmpl
SWAGGER_SPEC_S_TMPL := s|"basePath":\s*"/api/v1"|"basePath": "{{AppSubUrl}}/api/v1"|g
SWAGGER_SPEC_S_JSON := s|"basePath":\s*"{{AppSubUrl}}/api/v1"|"basePath": "/api/v1"|g
SWAGGER_SPEC_S_TMPL := s|"basePath": *"/api/v1"|"basePath": "{{AppSubUrl}}/api/v1"|g
SWAGGER_SPEC_S_JSON := s|"basePath": *"{{AppSubUrl}}/api/v1"|"basePath": "/api/v1"|g
SWAGGER_NEWLINE_COMMAND := -e '$$a\'

TEST_MYSQL_HOST ?= mysql:3306
TEST_MYSQL_DBNAME ?= testgitea
@@ -111,6 +112,7 @@ generate-swagger:
fi
swagger generate spec -o './$(SWAGGER_SPEC)'
$(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)'
$(SED_INPLACE) $(SWAGGER_NEWLINE_COMMAND) './$(SWAGGER_SPEC)'

.PHONY: swagger-check
swagger-check: generate-swagger


+ 1
- 1
templates/swagger/v1_json.tmpl View File

@@ -9222,4 +9222,4 @@
"SudoHeader": []
}
]
}
}

Loading…
Cancel
Save