inline build for merchant/mint

4 files changed, 36 insertions, 31 deletions

diff --git a/build_merchant.sh b/build_merchant.sh
deleted file mode 100755
index f30642b..0000000
--- a/build_merchant.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/merchant
-make clean || true
-./bootstrap
-./configure CFLAGS='-ggdb -O0' \
-	--prefix=$HOME/local --with-gnunet=$HOME/local \
-	--with-mint=$HOME/local \
-	--with-microhttpd=$HOME/local \
-	--enable-logging=verbose
-make
-make install
diff --git a/build_mint.sh b/build_mint.sh
deleted file mode 100755
index 8f14aa7..0000000
--- a/build_mint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/mint
-make clean || true
-./bootstrap
-./configure CFLAGS='-ggdb -O0' \
-        --with-libgnurl=$HOME/local \
-        --with-microhttpd=$HOME/local \
-	--prefix=$HOME/local --with-gnunet=$HOME/local \
-	--enable-logging=verbose
-make
-make install
-
diff --git a/update_merchant.sh b/update_merchant.sh
index 85803e9..80f8d1a 100755
--- a/update_merchant.sh
+++ b/update_merchant.sh
@@ -3,9 +3,26 @@
 export GNUNET_BASE_CONFIG=$HOME/deployment/taler-arm
 export PATH="$HOME/local/bin":$PATH
 
+build_merchant() {
+  (
+    set -eu
+
+    cd $HOME/merchant
+    make clean || true
+    ./bootstrap
+    ./configure CFLAGS='-ggdb -O0' \
+            --prefix=$HOME/local --with-gnunet=$HOME/local \
+            --with-mint=$HOME/local \
+            --with-microhttpd=$HOME/local \
+            --enable-logging=verbose
+    make
+    make install
+  )
+}
+
 cd $HOME/merchant/ && \
   git pull && \
   cd $HOME/deployment && \
-  ./build_merchant.sh && \
+  build_merchant && \
   gnunet-arm -k taler-merchant
 gnunet-arm -i taler-merchant
diff --git a/update_mint.sh b/update_mint.sh
index 25de63c..e5882d9 100755
--- a/update_mint.sh
+++ b/update_mint.sh
@@ -3,9 +3,26 @@
 export GNUNET_BASE_CONFIG=$HOME/deployment/taler-arm
 export PATH="$HOME/local/bin":$PATH
 
+build_mint() {
+  (
+    set -eu
+
+    cd $HOME/mint
+    make clean || true
+    ./bootstrap
+    ./configure CFLAGS='-ggdb -O0' \
+            --with-libgnurl=$HOME/local \
+            --with-microhttpd=$HOME/local \
+            --prefix=$HOME/local --with-gnunet=$HOME/local \
+            --enable-logging=verbose
+    make
+    make install
+  )
+}
+
 cd $HOME/mint && \
   git pull && \
   cd $HOME/deployment && \
-  ./build_mint.sh && \
+  build_mint && \
   gnunet-arm -k taler-mint
 gnunet-arm -i taler-mint