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 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 diff --git a/install.sh b/install.sh index 84af9a7..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 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 @@ -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 ~/