diff --git a/contrib/android/build.sh b/contrib/android/build.sh index 08a9b31fb..a156838eb 100755 --- a/contrib/android/build.sh +++ b/contrib/android/build.sh @@ -63,11 +63,14 @@ else fi DOCKER_RUN_FLAGS="" - if [[ "$3" == "release" ]] ; then info "'release' mode selected. mounting ~/.keystore inside container." DOCKER_RUN_FLAGS="-v $HOME/.keystore:/home/user/.keystore" fi +if sh -c ": >/dev/tty" >/dev/null 2>/dev/null; then + info "/dev/tty is available and usable" + DOCKER_RUN_FLAGS="$DOCKER_RUN_FLAGS -it" +fi info "building binary..." mkdir --parents "$PROJECT_ROOT_OR_FRESHCLONE_ROOT"/.buildozer/.gradle @@ -78,7 +81,7 @@ if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) sudo chown -R 1000:1000 "$FRESH_CLONE" fi fi -docker run -it --rm \ +docker run --rm \ --name electrum-android-builder-cont \ -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/home/user/wspace/electrum \ -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT"/.buildozer/.gradle:/home/user/.gradle \ diff --git a/contrib/build-linux/appimage/build.sh b/contrib/build-linux/appimage/build.sh index c16b19f95..8f66d5359 100755 --- a/contrib/build-linux/appimage/build.sh +++ b/contrib/build-linux/appimage/build.sh @@ -50,6 +50,12 @@ fi # defined in the type2-runtime repo (patched with type2-runtime-reproducible-build.patch) "$CONTRIB_APPIMAGE/make_type2_runtime.sh" || fail "Error building type2-runtime." +DOCKER_RUN_FLAGS="" +if sh -c ": >/dev/tty" >/dev/null 2>/dev/null; then + info "/dev/tty is available and usable" + DOCKER_RUN_FLAGS="-it" +fi + info "building binary..." # check uid and maybe chown. see #8261 if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) @@ -58,7 +64,7 @@ if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) sudo chown -R 1000:1000 "$FRESH_CLONE" fi fi -docker run -it \ +docker run $DOCKER_RUN_FLAGS \ --name electrum-appimage-builder-cont \ -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/opt/electrum \ --rm \ diff --git a/contrib/build-linux/sdist/build.sh b/contrib/build-linux/sdist/build.sh index 11a746273..aa68e08f6 100755 --- a/contrib/build-linux/sdist/build.sh +++ b/contrib/build-linux/sdist/build.sh @@ -46,6 +46,12 @@ else info "not doing fresh clone." fi +DOCKER_RUN_FLAGS="" +if sh -c ": >/dev/tty" >/dev/null 2>/dev/null; then + info "/dev/tty is available and usable" + DOCKER_RUN_FLAGS="-it" +fi + info "building binary..." # check uid and maybe chown. see #8261 if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) @@ -54,7 +60,7 @@ if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) sudo chown -R 1000:1000 "$FRESH_CLONE" fi fi -docker run -it \ +docker run $DOCKER_RUN_FLAGS \ --name electrum-sdist-builder-cont \ -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/opt/electrum \ --rm \ diff --git a/contrib/build-wine/build.sh b/contrib/build-wine/build.sh index f3bc4e6a9..c10e8751a 100755 --- a/contrib/build-wine/build.sh +++ b/contrib/build-wine/build.sh @@ -48,6 +48,12 @@ else info "not doing fresh clone." fi +DOCKER_RUN_FLAGS="" +if sh -c ": >/dev/tty" >/dev/null 2>/dev/null; then + info "/dev/tty is available and usable" + DOCKER_RUN_FLAGS="-it" +fi + info "building binary..." # check uid and maybe chown. see #8261 if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) @@ -56,7 +62,7 @@ if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) sudo chown -R 1000:1000 "$FRESH_CLONE" fi fi -docker run -it \ +docker run $DOCKER_RUN_FLAGS \ --name electrum-wine-builder-cont \ -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/opt/wine64/drive_c/electrum \ --rm \