diff --git a/.install/.kodi/userdata/guisettings.xml b/.install/.kodi/userdata/guisettings.xml index 3890d15..a3e467c 100644 --- a/.install/.kodi/userdata/guisettings.xml +++ b/.install/.kodi/userdata/guisettings.xml @@ -226,7 +226,7 @@ false true - 8181 + 8081 false xbmc webinterface.default diff --git a/.install/ipfs_alone.sh b/.install/ipfs_alone.sh index a1dd6d7..6bf7e50 100755 --- a/.install/ipfs_alone.sh +++ b/.install/ipfs_alone.sh @@ -133,8 +133,7 @@ ipfs bootstrap rm --all ########################################### # BOOTSTRAP NODES ARE ADDED LATER ########################################### -# AVOID CONFLICT WITH KODI REMOTE -# ipfs config Addresses.Gateway "/ip4/127.0.0.1/tcp/8181" +# AVOID CONFLICT WITH KODI ./.install/.kodi/userdata/guisettings.xml ipfs config Addresses.Gateway "/ip4/0.0.0.0/tcp/8080" [[ "$USER" != "xbian" ]] && sudo systemctl restart ipfs diff --git a/ISOconfig.sh b/ISOconfig.sh index 9b0655e..90b453e 100755 --- a/ISOconfig.sh +++ b/ISOconfig.sh @@ -281,7 +281,7 @@ do done # AVOID CONFLICT WITH KODI REMOTE -ipfs config Addresses.Gateway "/ip4/127.0.0.1/tcp/8181" +ipfs config Addresses.Gateway "/ip4/127.0.0.1/tcp/8080" ######################################################################## # SUDO permissions diff --git a/ajouter_video.sh b/ajouter_video.sh index 7a5ef50..631bfc3 100755 --- a/ajouter_video.sh +++ b/ajouter_video.sh @@ -603,12 +603,13 @@ FILE_SIZE=$(echo "${FILE_BSIZE}" | awk '{ split( "B KB MB GB TB PB" , v ); s=1; ######################################################################## ######################################################################## -if [ ! $2 ]; then - zenity --question --width 300 --text "OK! ~/astroport/Add_${MEDIAKEY}_script.sh ($FILE_SIZE). Voulez-vous lancer immédiatement l'ajout dans Astroport ?"; \ - [ $? == 0 ] && bash ~/astroport/Add_${MEDIAKEY}_script.sh "noh265"\ +zenity --question --width 300 --text "OK! ~/astroport/Add_${MEDIAKEY}_script.sh ($FILE_SIZE). Voulez-vous lancer immédiatement l'ajout dans Astroport ?"; \ + [ $? == 0 ] && bash ~/astroport/Add_${MEDIAKEY}_script.sh "noh265" \ && zenity --warning --width 300 --text "Ajoutez ce media dans vos journaux public 'qo-op' ou administratif 'moa'" \ - && [[ $(cat ~/.zen/game/players/.current/.playerns 2>/dev/null) ]] && xdg-open "http://127.0.0.1:8080/ipns/$(cat ~/.zen/game/players/.current/.playerns)" -fi -[ $? != 0 ] && zenity --warning --width 300 --text "Désolé une erreur est survenue... /tmp/${MEDIAKEY}.log"; exit 1 + && [[ $(cat ~/.zen/game/players/.current/.playerns 2>/dev/null) ]] \ + && xdg-open "http://127.0.0.1:8080/ipns/$(cat ~/.zen/game/players/.current/.playerns)" \ + || ( zenity --warning --width 300 --text "Désolé une erreur est survenue... /tmp/${MEDIAKEY}.log" && exit 1 )\ + exit 0 + echo "${MEDIAKEY} = RECORDED TO IPFS." cat /tmp/${MEDIAKEY}.log diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index e4a4cdc..73605a5 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -421,13 +421,13 @@ then TAGS="${CAT} astroport $GENRE" CANON='' else - TEXT='' + TEXT='${MEDIAKEY}' TAGS='$:/isAttachment $:/isIpfs astroport '${CAT} $GENRE CANON="/ipfs/"${IPFSID} fi ## Add screen - SCREENDIR=$(ipfs add -wq "$HOME/astroport/${TYPE}/${REFERENCE}/screen.png" | tail -n 1) + SCREENDIR=$(ipfs add -wq "$HOME/astroport/${TYPE}/${REFERENCE}/${CAT}.png" | tail -n 1) echo "## Creation json tiddler" echo '[