From 0842f4977b3bb7eab4f712802b9450a014f1bea4 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Thu, 17 Jun 2021 18:46:04 +0200
Subject: [PATCH] build: fresh_clone: turns out we can just clone from a local
 dir :P

this saves us some network requests, and reduces trust in github
---
 contrib/android/Readme.md           | 10 ++++-----
 contrib/build-linux/sdist/README.md | 10 ++++-----
 contrib/build-wine/README.md        | 11 +++++-----
 contrib/release.sh                  | 33 ++++++++++++-----------------
 4 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/contrib/android/Readme.md b/contrib/android/Readme.md
index 8db6102ca..b61cc7291 100644
--- a/contrib/android/Readme.md
+++ b/contrib/android/Readme.md
@@ -33,13 +33,11 @@ folder.
     (but you can skip this if reproducibility is not necessary).
 
     ```
-    $ FRESH_CLONE=contrib/android/fresh_clone && \
-        sudo rm -rf $FRESH_CLONE && \
+    $ FRESH_CLONE="contrib/android/fresh_clone/electrum" && \
+        sudo rm -rf "$FRESH_CLONE" && \
         umask 0022 && \
-        mkdir -p $FRESH_CLONE && \
-        cd $FRESH_CLONE  && \
-        git clone https://github.com/spesmilo/electrum.git && \
-        cd electrum
+        git clone . "$FRESH_CLONE" && \
+        cd "$FRESH_CLONE"
     ```
 
     And then build from this directory:
diff --git a/contrib/build-linux/sdist/README.md b/contrib/build-linux/sdist/README.md
index 20aef2b56..9381dc87d 100644
--- a/contrib/build-linux/sdist/README.md
+++ b/contrib/build-linux/sdist/README.md
@@ -29,13 +29,11 @@ folder.
     (but you can skip this if reproducibility is not necessary).
 
     ```
-    $ FRESH_CLONE=contrib/build-linux/sdist/fresh_clone && \
-        sudo rm -rf $FRESH_CLONE && \
+    $ FRESH_CLONE="contrib/build-linux/sdist/fresh_clone/electrum" && \
+        sudo rm -rf "$FRESH_CLONE" && \
         umask 0022 && \
-        mkdir -p $FRESH_CLONE && \
-        cd $FRESH_CLONE  && \
-        git clone https://github.com/spesmilo/electrum.git && \
-        cd electrum
+        git clone . "$FRESH_CLONE" && \
+        cd "$FRESH_CLONE"
     ```
 
     And then build from this directory:
diff --git a/contrib/build-wine/README.md b/contrib/build-wine/README.md
index 41bd906cd..b244850d6 100644
--- a/contrib/build-wine/README.md
+++ b/contrib/build-wine/README.md
@@ -35,12 +35,11 @@ folder.
     (but you can skip this if reproducibility is not necessary).
 
     ```
-    $ FRESH_CLONE=contrib/build-wine/fresh_clone && \
-        sudo rm -rf $FRESH_CLONE && \
-        mkdir -p $FRESH_CLONE && \
-        cd $FRESH_CLONE  && \
-        git clone https://github.com/spesmilo/electrum.git && \
-        cd electrum
+    $ FRESH_CLONE="contrib/build-wine/fresh_clone/electrum" && \
+        sudo rm -rf "$FRESH_CLONE" && \
+        umask 0022 && \
+        git clone . "$FRESH_CLONE" && \
+        cd "$FRESH_CLONE"
     ```
 
     And then build from this directory:
diff --git a/contrib/release.sh b/contrib/release.sh
index 5b6dba1b8..23156f572 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -37,13 +37,11 @@ if test -f dist/$target; then
 else
    pushd .
    sudo docker build -t electrum-sdist-builder-img contrib/build-linux/sdist
-   FRESH_CLONE=contrib/build-linux/sdist/fresh_clone && \
-       sudo rm -rf $FRESH_CLONE && \
-       umask 0022 && \
-       mkdir -p $FRESH_CLONE && \
-       cd $FRESH_CLONE  && \
-       git clone https://github.com/spesmilo/electrum.git &&\
-       cd electrum
+   FRESH_CLONE="contrib/build-linux/sdist/fresh_clone/electrum" && \
+        sudo rm -rf "$FRESH_CLONE" && \
+        umask 0022 && \
+        git clone . "$FRESH_CLONE" && \
+        cd "$FRESH_CLONE"
    git checkout "${COMMIT}^{commit}"
    sudo docker run -it \
 	--name electrum-sdist-builder-cont \
@@ -83,12 +81,11 @@ if test -f dist/$target; then
     echo "file exists: $target"
 else
     pushd .
-    FRESH_CLONE=contrib/build-wine/fresh_clone && \
-        sudo rm -rf $FRESH_CLONE && \
-        mkdir -p $FRESH_CLONE && \
-        cd $FRESH_CLONE  && \
-        git clone https://github.com/spesmilo/electrum.git && \
-        cd electrum
+    FRESH_CLONE="contrib/build-wine/fresh_clone/electrum" && \
+        sudo rm -rf "$FRESH_CLONE" && \
+        umask 0022 && \
+        git clone . "$FRESH_CLONE" && \
+        cd "$FRESH_CLONE"
     git checkout "${COMMIT}^{commit}"
     sudo docker run -it \
         --name electrum-wine-builder-cont \
@@ -113,13 +110,11 @@ if test -f dist/$target1; then
 else
     pushd .
     ./contrib/android/build_docker_image.sh
-    FRESH_CLONE=contrib/android/fresh_clone && \
-        sudo rm -rf $FRESH_CLONE && \
+    FRESH_CLONE="contrib/android/fresh_clone/electrum" && \
+        sudo rm -rf "$FRESH_CLONE" && \
         umask 0022 && \
-        mkdir -p $FRESH_CLONE && \
-        cd $FRESH_CLONE  && \
-        git clone https://github.com/spesmilo/electrum.git && \
-        cd electrum
+        git clone . "$FRESH_CLONE" && \
+        cd "$FRESH_CLONE"
     git checkout "${COMMIT}^{commit}"
     mkdir --parents $PWD/.buildozer/.gradle
     sudo docker run -it --rm \