Skip to content

Fixed incompatibility with BSD Unix sed in makefile (closes #749) #751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rfelber merged 4 commits into from
Oct 22, 2021
Merged

Fixed incompatibility with BSD Unix sed in makefile (closes #749) #751

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44c84a2
Fixes #749 by adding empty string for backup file in sed
Weltraumschaf Oct 21, 2021
4a75ef8
Simplify the makefile by removing shell specific syntax
Weltraumschaf Oct 21, 2021
6ebfbd5
Remove the rsync because
Weltraumschaf Oct 21, 2021
4faf5ff
Remove non-POSIX compliant switch from sed
Weltraumschaf Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,14 @@ docs: readme hook-docs scanner-docs operator-docs auto-discovery-docs demo-apps-
.PHONY: create-new-scanner
create-new-scanner: ## Creates templates for a new scanner, pass NAME=NEW-SCANNER
ifdef NAME
@mkdir scanners/$(NAME) ; \
rsync -a ./.templates/new-scanner/ ./scanners/$(NAME) ; \
echo "Copied template files to new directory ./scanners/$(NAME)"; \
cd scanners/$(NAME) ; \
find . -type f -exec sed -i 's/new-scanner/$(NAME)/g' {} + ; \
mv "./templates/new-scanner-parse-definition.yaml" "templates/$(NAME)-parse-definition.yaml" ; \
mv "./templates/new-scanner-scan-type.yaml" "templates/$(NAME)-scan-type.yaml" ;
cp -r ./.templates/new-scanner ./scanners/$(NAME)
find ./scanners/$(NAME) -type f ! -name 'tmp' \
-exec sed -n 's/new-scanner/$(NAME)/g;w ./scanners/$(NAME)/tmp' {} \; \
-exec mv ./scanners/$(NAME)/tmp {} \;
mv ./scanners/$(NAME)/templates/new-scanner-parse-definition.yaml ./scanners/$(NAME)/templates/$(NAME)-parse-definition.yaml
mv ./scanners/$(NAME)/templates/new-scanner-scan-type.yaml ./scanners/$(NAME)/templates/$(NAME)-scan-type.yaml
else
@echo "Scanner name not defined, please provide via make create-new-scanner NAME=NEW-SCANNER";
@echo "Scanner name not defined, please provide via make create-new-scanner NAME=NEW-SCANNER"
endif

.PHONY:
Expand Down