diff --git a/.gitmodules b/.gitmodules index 908cb60..25a4ec2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,7 @@ url = http://holoGit.ml.ipns.localhost:8080/wpreisser/websocketd.git [submodule "lib"] path = lib + url = https://ipfs.blockringtm.ml/ipns/hologit.ml/michelc/blockchain-lib.git +[submodule "dweb-lib"] + path = dweb-lib url = https://hologit-ml.ipns.dweb.link/michelc/blockchain-lib.git diff --git a/bin/toychain b/bin/toychain index 102b5ad..5564cb9 100755 --- a/bin/toychain +++ b/bin/toychain @@ -21,6 +21,8 @@ $pgm sync \$name # to synchronize a \$name node $pgm update \$tag # to synchronize a \$tag node $pgm test \$tc # to run the \$tc test case $pgm debug \$cmd # to running \$cmd in debug mode +$pgm install # to install dependant libraries essentially CPAN perl modules +$pgm ship # to package and ship libraries (i.e. push to holo-git) EOT @@ -39,6 +41,8 @@ case $what in test) tctest $@;; debug) tcdebug $@;; support) echo "do you need help with $pgm ?\n- call our support line at https://www.drit.ml\n-- Dr I·T";; + install) tcinstall $@;; + ship) tcship $@;; log) tclog;; *) tcrun $@;; esac @@ -77,14 +81,16 @@ tcupdate() { tag=$2 echo "$pgm: updating daemon with tag $tag..." top=$(git rev-parse --show-toplevel) - echo // updating $top - git pull --ff-only --recurse-submodules=yes origin master 2>&1 | tee transcript.log + date +%s >> transcript.log + echo // updating $top >> transcript.log + git pull --ff-only --recurse-submodules=yes origin master 2>&1 | tee -a transcript.log echo // checking out $tag git checkout $tag 2>&1 | tee -a transcript.log git log -1 cd $top/lib echo // updating $top/lib git pull --ff-only origin master 2>&1 | tee -a transcript.log + echo . >> transcript.log git log -1 echo "---" } @@ -115,20 +121,48 @@ tcdebug() { echo "---" } +tcinstall() { + echo "$pgm: installing dependancies ..." + echo "---" +} + tcversion() { top=$(git rev-parse --show-toplevel) gitid0=$(git rev-parse --short HEAD) + date +%s >> transcript.log git pull --ff-only --recurse-submodules=yes origin master 1>> transcript.log 2>&1 git checkout $tag 1>> transcript.log 2>&1 gitid1=$(git rev-parse --short HEAD) - if [ "x$gitid0" != "x$gitid1" ]; then gitid1=$gitdi0-$gitid1; fi + if [ "x$gitid0" != "x$gitid1" ]; then gitid1=$gitid0-$gitid1; fi cd $top/lib git pull --ff-only origin master 1>> transcript.log 2>&1 gitid2=$(git rev-parse --short HEAD) echo Version: $gitid1-$gitid2 + echo Version: $gitid1-$gitid2 >> transcript.log + echo . >> transcript.log } +tcship() { # only for internal use (i.e. Dr I·T) + date=$(date) + top=$(git rev-parse --show-toplevel) + cd $top/lib + gituser + git commit -a -m "snapshot $date" + if which holo-git-push 2> /dev/null; then + holo-git-push + else + git push origin master + fi + gitid=$(git rev-parse --short HEAD) + cd $top + gituser + git commit -a -m "library update ($gitid) on $date" + git push origin master + git push keybase master + git push toptal master +} + main $@; exit $?;