From 5ffd106fa6e1868dfc8622da5d4c610c2a18fd3a Mon Sep 17 00:00:00 2001 From: Max Winterstein Date: Sat, 27 Feb 2021 00:30:46 +0100 Subject: [PATCH] Unify helper --- eufy-ha-mqtt-bridge/helper-builder.sh | 1 + ...per-build-and-push.sh => helper-builder.sh | 32 +++++++++++-------- ioBroker/helper-builder.sh | 1 + .../helper-build-and-push.sh | 22 ------------- toogoodtogo-ha-mqtt-bridge/helper-builder.sh | 1 + 5 files changed, 22 insertions(+), 35 deletions(-) create mode 120000 eufy-ha-mqtt-bridge/helper-builder.sh rename ioBroker/helper-build-and-push.sh => helper-builder.sh (52%) create mode 120000 ioBroker/helper-builder.sh delete mode 100644 toogoodtogo-ha-mqtt-bridge/helper-build-and-push.sh create mode 120000 toogoodtogo-ha-mqtt-bridge/helper-builder.sh diff --git a/eufy-ha-mqtt-bridge/helper-builder.sh b/eufy-ha-mqtt-bridge/helper-builder.sh new file mode 120000 index 0000000..77833e0 --- /dev/null +++ b/eufy-ha-mqtt-bridge/helper-builder.sh @@ -0,0 +1 @@ +../helper-builder.sh \ No newline at end of file diff --git a/ioBroker/helper-build-and-push.sh b/helper-builder.sh similarity index 52% rename from ioBroker/helper-build-and-push.sh rename to helper-builder.sh index 897cdeb..ff203e6 100644 --- a/ioBroker/helper-build-and-push.sh +++ b/helper-builder.sh @@ -2,28 +2,34 @@ # see https://github.com/home-assistant/builder +# thx https://stackoverflow.com/a/51911626 +__usage=" +Usage: $(basename $0) [OPTIONS] + +Options: + push Build all possible and push + test Build for + +Example: + $(basename $0) test amd64 +" + if [[ $1 = "push" ]]; then - echo 'build and push...' - sleep 5 - echo -n Dockerhub password for maxwinterstein: + echo 'Build all and push...' + echo -n "Dockerhub password for maxwinterstein: " read -s password - echo docker run --privileged \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ -v $PWD/:/data homeassistant/amd64-builder \ --all -t /data --docker-user maxwinterstein --docker-password $password #--docker-hub-check elif [[ $1 = "test" ]]; then - echo 'Just testing all...' + arch=${2:-all} + echo "Build for $arch..." sleep 5 - docker run --privileged -v ~/.docker:/root/.docker \ + docker run --privileged \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ -v $PWD/:/data homeassistant/amd64-builder \ - --all --test -t /data + --$arch --test -t /data else - echo 'Just testing all...' - sleep 5 - docker run --privileged -v ~/.docker:/root/.docker \ - -v /var/run/docker.sock:/var/run/docker.sock:ro \ - -v $PWD/:/data homeassistant/amd64-builder \ - --amd64 --test -t /data + echo "$__usage" fi diff --git a/ioBroker/helper-builder.sh b/ioBroker/helper-builder.sh new file mode 120000 index 0000000..77833e0 --- /dev/null +++ b/ioBroker/helper-builder.sh @@ -0,0 +1 @@ +../helper-builder.sh \ No newline at end of file diff --git a/toogoodtogo-ha-mqtt-bridge/helper-build-and-push.sh b/toogoodtogo-ha-mqtt-bridge/helper-build-and-push.sh deleted file mode 100644 index f8d31fb..0000000 --- a/toogoodtogo-ha-mqtt-bridge/helper-build-and-push.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# see https://github.com/home-assistant/builder - -if [[ $1 = "push" ]]; then - echo 'build and push...' - sleep 5 - echo -n Dockerhub password for maxwinterstein: - read -s password - echo - docker run --privileged \ - -v /var/run/docker.sock:/var/run/docker.sock:ro \ - -v $PWD/:/data homeassistant/amd64-builder \ - --all -t /data --docker-user maxwinterstein --docker-password $password #--docker-hub-check -else - echo 'Just testing...' - sleep 5 - docker run --privileged -v ~/.docker:/root/.docker \ - -v /var/run/docker.sock:/var/run/docker.sock:ro \ - -v $PWD/:/data homeassistant/amd64-builder \ - --amd64 --test -t /data -fi diff --git a/toogoodtogo-ha-mqtt-bridge/helper-builder.sh b/toogoodtogo-ha-mqtt-bridge/helper-builder.sh new file mode 120000 index 0000000..77833e0 --- /dev/null +++ b/toogoodtogo-ha-mqtt-bridge/helper-builder.sh @@ -0,0 +1 @@ +../helper-builder.sh \ No newline at end of file