chore: whitespace

contrib/build-linux/appimage/Dockerfile

@@ -1,30 +1,35 @@
-FROM ubuntu:16.04@sha256:a4fc0c40360ff2224db3a483e5d80e9164fe3fdce2a8439d2686270643974632
+FROM ubuntu:20.04
 
 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
 
-RUN apt-get update -q && \
-    apt-get install -qy \
-        git=1:2.7.4-0ubuntu1.10 \
-        wget=1.17.1-1ubuntu1.5 \
-        make=4.1-6 \
-        autotools-dev=20150820.1 \
-        autoconf=2.69-9 \
-        libtool=2.4.6-0.1 \
-        xz-utils=5.1.1alpha+20120614-2ubuntu2 \
-        libssl-dev=1.0.2g-1ubuntu4.20 \
-        libssl1.0.0=1.0.2g-1ubuntu4.20 \
-        openssl=1.0.2g-1ubuntu4.20 \
-        zlib1g-dev=1:1.2.8.dfsg-2ubuntu4.3 \
-        libffi-dev=3.2.1-4 \
-        libncurses5-dev=6.0+20160213-1ubuntu1 \
-        libsqlite3-dev=3.11.0-1ubuntu1.5 \
-        libusb-1.0-0-dev=2:1.0.20-1 \
-        libudev-dev=229-4ubuntu21.31 \
-        gettext=0.19.7-2ubuntu3.1 \
-        libzbar0=0.10+doc-10ubuntu1 \
-        libdbus-1-3=1.10.6-1ubuntu3.6 \
-        libxkbcommon-x11-0=0.5.0-1ubuntu2.1 \
-        libc6-dev=2.23-0ubuntu11.3 \
+ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update -qy
+RUN TZ=Europe/Warsaw apt-get -y install tzdata
+
+RUN apt-get install -qy \
+        git \
+        wget \
+        make \
+        autotools-dev \
+        autoconf \
+        libtool \
+        xz-utils \
+        libssl-dev \
+        libssl1.1 \
+        openssl \
+        zlib1g-dev \
+        libffi-dev \
+        libncurses5-dev \
+        libsqlite3-dev \
+        libusb-1.0-0-dev \
+        libudev-dev \
+        gettext \
+        libzbar0 \
+        libdbus-1-3 \
+        libxkbcommon-x11-0 \
+        libc6-dev \
         && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \

contrib/build-linux/appimage/apprun.sh

@@ -8,4 +8,4 @@ export LD_LIBRARY_PATH="${APPDIR}/usr/lib/:${APPDIR}/usr/lib/x86_64-linux-gnu${L
 export PATH="${APPDIR}/usr/bin:${PATH}"
 export LDFLAGS="-L${APPDIR}/usr/lib/x86_64-linux-gnu -L${APPDIR}/usr/lib"
 
-exec "${APPDIR}/usr/bin/python3.7" -s "${APPDIR}/usr/bin/electrum" "$@"
+exec "${APPDIR}/usr/bin/python3.8" -s "${APPDIR}/usr/bin/electrum" "$@"

contrib/build-linux/appimage/build.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+git config --global --add safe.directory /opt/electrum
+git config --global --add safe.directory /opt/electrum/electrum/www
+
 PROJECT_ROOT="$(dirname "$(readlink -e "$0")")/../../.."
 CONTRIB="$PROJECT_ROOT/contrib"
 CONTRIB_APPIMAGE="$CONTRIB/build-linux/appimage"
@@ -126,6 +129,7 @@ info "installing electrum and its dependencies."
 #       hence "--no-binary :all:" flags. However, we specifically allow
 #       - PyQt5, as it's harder to build from source
 #       - cryptography, as building it would need openssl 1.1, not available on ubuntu 16.04
+"$python" -m pip install importlib-metadata
 "$python" -m pip install --no-dependencies --no-binary :all: --no-warn-script-location \
     --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements.txt"
 "$python" -m pip install --no-dependencies --no-binary :all: --only-binary PyQt5,PyQt5-Qt5,cryptography --no-warn-script-location \