bugfix namespace, build__all script, simple pilots

- build__all.sh
- build__common.sh (includes common_start and common_end) which
  simplifies pilots

build__all.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+set -u
+# DEBUG
+set -x
+
+main() {
+        action="${action:-deploy}"
+        export deployment='prod'
+        ./build__pilot-xo9b.sh
+        ./build__pilot-setem.sh
+        ./build__pilot-lafede.sh
+        ./build__pilot-pangea.sh
+}
+
+main "${@}"

build__common.sh

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -e
+set -u
+# DEBUG
+#set -x
+
+common_start() {
+        figlet "${pilot}"
+
+        deployment="${1:-${deployment:-}}"
+        action="${action:-deploy}"
+
+        # detach on production deployment
+        if [ "${deployment}" = 'prod' ]; then
+                detach='-d'
+        fi
+
+        # ensure uses pilot-pangea branch
+        (
+                cd ./IdHub
+                git checkout ${pilot}
+        )
+
+        # some pilots might use idhub1 and/or idhub2
+        idhub1="idhub1__${pilot}"
+        idhub2="idhub2__${pilot}"
+
+        # force recreate
+        rm -rf "./${idhub1}" "./${idhub2}"
+}
+
+common_end() {
+
+        idhub_dc_f="docker-compose__${pilot}.yml"
+        docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
+        make idhub_build
+
+        if [ "${action:-}" = "deploy" ]; then
+                docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
+        fi
+
+}

build__pilot-lafede.sh

@@ -7,24 +7,14 @@ set -x
 
 # a wallet and verifier idhub for pilot-lafede
 main() {
-        deployment="${1:-}"
+        # includes functions:
-
+        #   common_start
-        # detach on production deployment
+        #   common_end
-        if [ "${deployment}" = 'prod' ]; then
+        . ./build__common.sh
-                detach='-d'
-        fi
-
-        # ensure uses pilot-lafede branch
-        (
-                cd ./IdHub
-                git checkout pilot-lafede
-        )
 
         pilot='pilot-lafede'
-        local idhub1="idhub1__${pilot}"
 
-        # force recreate
+        common_start
-        rm -rf "./${idhub1}"
 
         # detect if is new
         if [ ! -f "./${idhub1}" ]; then
@@ -33,10 +23,7 @@ main() {
                 rm -f "${idhub1}/db.sqlite3"
         fi
 
-        idhub_dc_f="docker-compose__${pilot}.yml"
+        common_end
-        docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
-        make idhub_build \
-                && docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
 }
 
 main "${@}"

build__pilot-pangea.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+set -u
+# DEBUG
+set -x
+
+# a wallet and verifier idhub for pilot-pangea
+main() {
+        # includes functions:
+        #   common_start
+        #   common_end
+        . ./build__common.sh
+
+        pilot='pilot-pangea'
+
+        common_start
+
+        # detect if is new
+        if [ ! -f "./${idhub1}" ] && [ ! -f "./${idhub2}" ]; then
+                echo 'Detected new deployment, recreating git repos idhub1 and idhub2'
+                cp -rp IdHub "${idhub1}"
+                rm -f "${idhub1}/db.sqlite3"
+                cp -rp IdHub "${idhub2}"
+                rm -f "${idhub2}/db.sqlite3"
+        fi
+
+        common_end
+}
+
+main "${@}"

build__pilot-setem.sh

@@ -7,25 +7,14 @@ set -x
 
 # a wallet and verifier idhub for pilot-setem
 main() {
-        deployment="${1:-}"
+        # includes functions:
-
+        #   common_start
-        # detach on production deployment
+        #   common_end
-        if [ "${deployment}" = 'prod' ]; then
+        . ./build__common.sh
-                detach='-d'
-        fi
-
-        # ensure uses pilot-setem branch
-        (
-                cd ./IdHub
-                git checkout pilot-setem
-        )
 
         pilot='pilot-setem'
-        local idhub1="idhub1__${pilot}"
-        local idhub2="idhub2__${pilot}"
 
-        # force recreate
+        common_start
-        rm -rf "./${idhub1}" "./${idhub2}"
 
         # detect if is new
         if [ ! -f "./${idhub1}" ] && [ ! -f "./${idhub2}" ]; then
@@ -36,10 +25,7 @@ main() {
                 rm -f "${idhub2}/db.sqlite3"
         fi
 
-        idhub_dc_f="docker-compose__${pilot}.yml"
+        common_end
-        docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
-        make idhub_build \
-                && docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
 }
 
 main "${@}"

build__pilot-xo9b.sh

@@ -7,25 +7,14 @@ set -x
 
 # a wallet and verifier idhub for pilot-xo9b
 main() {
-        deployment="${1:-}"
+        # includes functions:
-
+        #   common_start
-        # detach on production deployment
+        #   common_end
-        if [ "${deployment}" = 'prod' ]; then
+        . ./build__common.sh
-                detach='-d'
-        fi
-
-        # ensure uses pilot-xo9b branch
-        (
-                cd ./IdHub
-                git checkout pilot-xo9b
-        )
 
         pilot='pilot-xo9b'
-        local idhub1="idhub1__${pilot}"
-        local idhub2="idhub2__${pilot}"
 
-        # force recreate
+        common_start
-        rm -rf "./${idhub1}" "./${idhub2}"
 
         # detect if is new
         if [ ! -f "./${idhub1}" ] && [ ! -f "./${idhub2}" ]; then
@@ -36,10 +25,7 @@ main() {
                 rm -f "${idhub2}/db.sqlite3"
         fi
 
-        idhub_dc_f="docker-compose__${pilot}.yml"
+        common_end
-        docker compose -p ${pilot} -f ${idhub_dc_f} down -v || true
-        make idhub_build \
-                && docker compose -p ${pilot} -f ${idhub_dc_f} up ${detach:-}
 }
 
 main "${@}"