diff --git a/README.md b/README.md index 16f6cc4..46ec787 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,7 @@ The program runs on GNU/Linux, MacOSX, FreeBSD, and Raspberry Pi. | OS | Status | | ------------ |:-------------:| |GNU/Linux & MacOSX| [![Build Status](https://travis-ci.org/weetmuts/wmbusmeters.svg?branch=master)](https://travis-ci.org/weetmuts/wmbusmeters) | - -|arm versions|[![CircleCI>](https://circleci.com/gh/weetmuts/wmbusmeters.svg?style=svg)](https://circleci.com/gh/weetmuts/workflows/wmbusmeters)| +|Arm versions|[![CircleCI>](https://circleci.com/gh/weetmuts/wmbusmeters.svg?style=svg)](https://circleci.com/gh/weetmuts/workflows/wmbusmeters)| | Static Scan | Status | diff --git a/docker/Dockerfile b/docker/Dockerfile index 5bcc7b9..a4ab124 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,7 +9,7 @@ RUN make release && chmod 755 build/rtl_wmbus FROM multiarch/alpine:amd64-latest-stable as scratch ENV QEMU_EXECVE=1 -RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr ncurses +RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr WORKDIR /wmbusmeters COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus diff --git a/src/shell.cc b/src/shell.cc index ac0a00b..d1f3552 100644 --- a/src/shell.cc +++ b/src/shell.cc @@ -23,12 +23,7 @@ #include #include #include -#if defined(__APPLE__) && defined(__MACH__) or defined(__FreeBSD__) #include -#else -#include -#endif - #include void invokeShell(string program, vector args, vector envs)