diff --git a/install.sh b/install.sh deleted file mode 100755 index bc75115..0000000 --- a/install.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -(cd install/script && TRACING=1 ./install.sh) \ No newline at end of file diff --git a/install/script/configure.sh b/install/script/configure.sh new file mode 100644 index 0000000..9d335c5 --- /dev/null +++ b/install/script/configure.sh @@ -0,0 +1,25 @@ +. ./docker.sh +. ./cyphernodeconf.sh + +configure() { + trace "Updating SatoshiPortal dockers" + #git submodule update --recursive --remote + # + ## build SatoshiPortal images + #local arch=x86_64 + #build_docker_image ../SatoshiPortal/dockers/$arch/bitcoin-core btcnode + #build_docker_image ../SatoshiPortal/dockers/$arch/LN/c-lightning clnimg + # + ## build cyphernode images + #build_docker_image ../../cron_docker/ proxycronimg + build_docker_image ../../proxy_docker/ btcproxyimg + #build_docker_image ../../pycoin_docker/ pycoinimg + # + ## build setup docker image + build_docker_image ../ cyphernodeconf && clear && echo "Thinking..." + + # configure features of cyphernode + cyphernodeconf_configure + + #docker image rm cyphernodeconf:latest +} diff --git a/install/script/cyphernodeconf.sh b/install/script/cyphernodeconf.sh old mode 100755 new mode 100644 index a057b0c..036cb11 --- a/install/script/cyphernodeconf.sh +++ b/install/script/cyphernodeconf.sh @@ -1,7 +1,3 @@ -#!/bin/sh - -. ./trace.sh - # this will run configure.sh of the specified package inside a # cyphernodeconf container. This way we ensure we have the right # environment and do not pollute the host machine with utility diff --git a/install/script/docker.sh b/install/script/docker.sh old mode 100755 new mode 100644 index 78447df..4d30004 --- a/install/script/docker.sh +++ b/install/script/docker.sh @@ -1,7 +1,3 @@ -#!/bin/sh - -. ./trace.sh - build_docker_image() { trace "building docker image: $1 with tag $2:latest" diff --git a/install/script/install.sh b/install/script/install.sh old mode 100755 new mode 100644 index b1979b2..eac781d --- a/install/script/install.sh +++ b/install/script/install.sh @@ -1,28 +1,3 @@ -#!/bin/sh - -. ./trace.sh -. ./docker.sh -. ./cyphernodeconf.sh - -config_file=$1 - -trace "Updating SatoshiPortal dockers" -#git submodule update --recursive --remote -# -## build SatoshiPortal images -#local arch=x86_64 -#build_docker_image ../SatoshiPortal/dockers/$arch/bitcoin-core btcnode -#build_docker_image ../SatoshiPortal/dockers/$arch/LN/c-lightning clnimg -# -## build cyphernode images -#build_docker_image ../../cron_docker/ proxycronimg -build_docker_image ../../proxy_docker/ btcproxyimg -#build_docker_image ../../pycoin_docker/ pycoinimg -# -## build setup docker image -build_docker_image ../ cyphernodeconf && clear && echo "Thinking..." - -# configure features of cyphernode -cyphernodeconf_configure - -#docker image rm cyphernodeconf:latest +install() { + echo "Installation phase not implemented yet" +} \ No newline at end of file diff --git a/install/script/setup.sh b/install/script/setup.sh new file mode 100755 index 0000000..806a90e --- /dev/null +++ b/install/script/setup.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +. ./trace.sh +. ./configure.sh +. ./install.sh + +echo "Starting configuration phase" +configure + +echo "Starting installation phase" +install \ No newline at end of file diff --git a/install/script/trace.sh b/install/script/trace.sh index b67a0cf..c4a6e81 100644 --- a/install/script/trace.sh +++ b/install/script/trace.sh @@ -1,5 +1,3 @@ -#!/bin/sh - trace() { if [ -n "${TRACING}" ]; then diff --git a/setup.sh b/setup.sh new file mode 100755 index 0000000..c8831d7 --- /dev/null +++ b/setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +(cd install/script && TRACING=1 ./setup.sh) \ No newline at end of file