From 0da2b86a69a2947a8cd03399bfd4e6d3857cf51f Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 31 May 2022 18:01:22 +0200 Subject: [PATCH 1/4] git pull Astroport.ONE --- cron_MINUTE.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 8c81734..9d5e7bb 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -164,8 +164,11 @@ fi if [[ $(($runtime % 15)) == 0 ]]; then ########## DESYNCH SWARM NODE REQUESTS ################# + [[ -d ~/.zen/Astroport.ONE ]] && cd ~/.zen/Astroport.ONE && sleep $((1 + RANDOM % 12)) && git pull # git reset --hard - git pull + cd $MY_PATH + sleep $((1 + RANDOM % 3)) && git pull + [[ ! $? == 0 ]] && echo "GIT.P2P.LEGAL IS UNREACHABLE" # if [[ $(diff ~/.zen/astrXbian/.install/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml ~/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml) ]]; then # cp ~/.zen/astrXbian/.install/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml ~/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml From 4f45e0908e7f75c7542d3d30d4388dd37d94371f Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 1 Jun 2022 14:21:07 +0200 Subject: [PATCH 2/4] IPFS must be installed before astrXbian. Creating systemd startup scripts --- install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index 84af9a7..8537a53 100755 --- a/install.sh +++ b/install.sh @@ -66,7 +66,7 @@ echo "###########################" echo 'export PATH=$PATH:$HOME/.local/bin' >> ~/.bashrc && source ~/.bashrc; echo ">>> PATH=$PATH" python3 -m pip install -U pip python3 -m pip install -U setuptools wheel -python3 -m pip install -U cryptography Ed25519 base58 google protobuf duniterpy +python3 -m pip install -U cryptography Ed25519 base58 google protobuf protobuf-compiler duniterpy python3 -m pip install -U nicotine-plus silkaj if [[ "$USER" == "pi" ]]; then ## PROPOSE QR_CODE PRINTER SUR RPI @@ -86,10 +86,6 @@ fi sudo ln -f -s /usr/bin/python3 /usr/bin/python -## Scripts pour systemd ou InitV (xbian) -echo "=== Activation SYSTEM IPFS" -~/.zen/astrXbian/.install/ipfs_alone.sh - ######################################################################## echo "=== Clonage git CODE 'astrXbian' + 'Astroport.ONE' depuis https://git.p2p.legal" mkdir -p ~/.zen @@ -98,6 +94,11 @@ git clone https://git.p2p.legal/axiom-team/astrXbian.git git clone https://git.p2p.legal/qo-op/Astroport.ONE.git # TODO INSTALL FROM IPFS / IPNS + +## Scripts pour systemd ou InitV (xbian) +echo "=== Activation SYSTEM IPFS" +~/.zen/astrXbian/.install/ipfs_alone.sh + ######################################################################## echo "=== IMPORT configuration ASTROPORT dans ~/.kodi" cp -Rf ~/.zen/astrXbian/.install/.kodi ~/ From 1f52333d6cdf1d0c0324737544c00f209be49b19 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 1 Jun 2022 14:43:23 +0200 Subject: [PATCH 3/4] python crypto tools --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 8537a53..d0bac96 100755 --- a/install.sh +++ b/install.sh @@ -66,7 +66,7 @@ echo "###########################" echo 'export PATH=$PATH:$HOME/.local/bin' >> ~/.bashrc && source ~/.bashrc; echo ">>> PATH=$PATH" python3 -m pip install -U pip python3 -m pip install -U setuptools wheel -python3 -m pip install -U cryptography Ed25519 base58 google protobuf protobuf-compiler duniterpy +python3 -m pip install -U cryptography Ed25519 base58 google protobuf duniterpy pynacl pgpy python3 -m pip install -U nicotine-plus silkaj if [[ "$USER" == "pi" ]]; then ## PROPOSE QR_CODE PRINTER SUR RPI From 5474cf1699bb68119b3c434bc543518719b0ae7b Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 1 Jun 2022 16:16:08 +0200 Subject: [PATCH 4/4] sudo brother_ql_print for ALL --- ISOconfig.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ISOconfig.sh b/ISOconfig.sh index 3262ca3..1a9d3d6 100755 --- a/ISOconfig.sh +++ b/ISOconfig.sh @@ -297,6 +297,9 @@ echo "$USER ALL=(ALL) NOPASSWD:/usr/bin/apt" | (sudo su -c 'EDITOR="tee" visudo ## USED FOR "systemctl restart ipfs" echo "$USER ALL=(ALL) NOPASSWD:/bin/systemctl" | (sudo su -c 'EDITOR="tee" visudo -f /etc/sudoers.d/systemctl') +## brother_ql_print +echo "$USER ALL=(ALL) NOPASSWD:/usr/local/bin/brother_ql_print" | (sudo su -c 'EDITOR="tee" visudo -f /etc/sudoers.d/brother_ql_print') + ## INSTALL TiddlyWiki [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/index.html ]] && mkdir -p ~/.zen/ipfs/.${IPFSNODEID} && cp ~/.zen/astrXbian/.install/templates/tiddlywiki/index.html ~/.zen/ipfs/.${IPFSNODEID}/index.html