Skip to content
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

Merge pr 247 (fix sed usage) #253

Merged
merged 5 commits into from
Sep 17, 2015
Merged

Merge pr 247 (fix sed usage) #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99bda40
fix usage of sed with -i option
darxriggs Sep 15, 2015
1465246
cleanup - remove .bk files from sed
darxriggs Sep 15, 2015
09aafb0
Merge branch 'fix-sed-usage' of https://github.com/darxriggs/packetbe…
Sep 17, 2015
17149d9
Merge branch 'darxriggs-fix-sed-usage' into merge_pr_247
Sep 17, 2015
d8de812
Merge branch 'master' into merge_pr_247
Sep 17, 2015
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ darwin_dist: packetbeat
cp packetbeat packetbeat-$(VERSION)-darwin
cp etc/packetbeat.yml packetbeat-$(VERSION)-darwin/
cp etc/packetbeat.template.json packetbeat-$(VERSION)-darwin/
sed -i .bk 's/device: any/device: en0/' packetbeat-$(VERSION)-darwin/packetbeat.yml
sed -i.bk 's/device: any/device: en0/' packetbeat-$(VERSION)-darwin/packetbeat.yml
rm packetbeat-$(VERSION)-darwin/packetbeat.yml.bk
tar czvf packetbeat-$(VERSION)-darwin.tgz packetbeat-$(VERSION)-darwin
shasum packetbeat-$(VERSION)-darwin.tgz > packetbeat-$(VERSION)-darwin.tgz.sha1.txt
Expand All @@ -72,10 +72,11 @@ install_cfg:
# darwin
cp etc/packetbeat.yml $(PREFIX)/packetbeat-darwin.yml
sed -i.bk 's/device: any/device: en0/' $(PREFIX)/packetbeat-darwin.yml
rm $(PREFIX)/packetbeat-darwin.yml.bk
# win
cp etc/packetbeat.yml $(PREFIX)/packetbeat-win.yml
sed -i.bk 's/device: any/device: 0/' $(PREFIX)/packetbeat-win.yml

rm $(PREFIX)/packetbeat-win.yml.bk

.PHONY: gofmt
gofmt:
Expand Down Expand Up @@ -104,7 +105,6 @@ coverage:
GOPATH=$(shell $(GODEP) path):$(GOPATH) $(GOPATH)/bin/gotestcover -coverprofile=./coverage/unit.cov -covermode=count github.com/elastic/packetbeat/...
$(GODEP) go tool cover -html=./coverage/unit.cov -o coverage/unit.html


.PHONY: benchmark
benchmark:
$(GODEP) go test -short -bench=. ./...
Expand Down
8 changes: 4 additions & 4 deletions scripts/generate_gettingstarted.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ EOF

cat $INPUT >> $OUTPUT

sed -i .bk "s/\$PB_VERSION/$PB_VERSION/g" $OUTPUT
sed -i .bk "s/\$ES_VERSION/$ES_VERSION/g" $OUTPUT
sed -i .bk "s/\$KIBANA_VERSION/$KIBANA_VERSION/g" $OUTPUT
sed -i .bk "s/\$DASHBOARDS_VERSION/$DASHBOARDS_VERSION/g" $OUTPUT
sed -i.bk "s/\$PB_VERSION/$PB_VERSION/g" $OUTPUT
sed -i.bk "s/\$ES_VERSION/$ES_VERSION/g" $OUTPUT
sed -i.bk "s/\$KIBANA_VERSION/$KIBANA_VERSION/g" $OUTPUT
sed -i.bk "s/\$DASHBOARDS_VERSION/$DASHBOARDS_VERSION/g" $OUTPUT
rm $OUTPUT.bk