diff --git a/.install/ipfs.sh b/.install/ipfs.sh index 23b88b8..7b6a19b 100755 --- a/.install/ipfs.sh +++ b/.install/ipfs.sh @@ -6,11 +6,12 @@ MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized ## Config -diskSize="5G" +totalDiskSize=$(df -P | awk 'NR>2{sum+=$2}END{print sum}') +diskSize="$((totalDiskSize / 3))" templates="$MY_PATH/templates/ipfs" if [ "$EUID" -eq 0 ] - then echo -e "${c_red}Veuillez ne pas executez ce script en root. Choisissez un utilisateur pour votre serveur G1sms+ (nous recommandons l'utilisateur pi)$c_" + then echo -e "${c_red}DO NOT EXECUTE AS root. Choose a user for your Astroport Station (we like pi)$c_" exit 1 else echo -e "${c_yellow}OK $USER, let's go!$c_"; fi diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh index 3e2f783..2a05b55 100755 --- a/.install/scuttlebutt.sh +++ b/.install/scuttlebutt.sh @@ -10,30 +10,23 @@ scuttlebutt() { sudo apt-get install -y socat python3-dev libtool python3-setuptools autoconf automake # Install nvm - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash - source ~/.bashrc - nvm install --lts + [[ ! $(which nvm) ]] && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash && source ~/.bashrc && nvm install --lts # Install ssb-server and config in ~/.ssb_astroport [[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport cd ~/.ssb_astroport ### Install module in ~/.ssb_astroport/node_modules - # npm install sodium-native ssb-backlinks ssb-ws ssb-links ssb-query ssb-secret-blob ssb-private - # npm install -g ssb-server + npm install sodium-native ssb-backlinks ssb-ws ssb-links ssb-query ssb-secret-blob ssb-private + npm install -g ssb-server - ### Install oasis webclient (could replace ssb-server, TODO: try it) + # TODO plugin activation !?? + # sbot plugins.enable + + ### Install oasis & ssb-cli (could replace ssb-server?? TODO: try it) npm -g install fraction/oasis#semver: npm -g install ssb-cli@latest - # Move node_modules with ssb-server (why do I have to do that? crazy heavy crappy wonderful node.js ) - ssbSERVER=$(which ssb-server) - node_bin_path=$(dirname $ssbSERVER) - node_lib_path=$(dirname $ssbSERVER | sed s/bin/lib/) - mv ~/.ssb_astroport/node_modules/* $node_lib_path/node_modules/ - # Create sblob symlink - ln -s $node_lib_path/node_modules/ssb-secret-blob/index.js $node_bin_path/sblob - # INSTALL sbotc if [[ ! $(which sbotc) ]]; then sudo apt install libsodium-dev jq -y diff --git a/zen/README.md b/zen/README.md index 6a19b3b..495ba77 100644 --- a/zen/README.md +++ b/zen/README.md @@ -15,6 +15,7 @@ ~/.zen/ipfs/.$ipfsnodeid/TAG/${J}/_tag.uid ~/.zen/ipfs/.$ipfsnodeid/TAG/${J}/_tag.passenger.filename ~/.zen/ipfs/.$ipfsnodeid/TAG/${J}/_tag.passenger.metadata.json +~/.zen/ipfs/.$ipfsnodeid/TAG/${J}/_tag.passenger.fulltitle # ssb_SURVEY_contact.sh ~/.zen/ipfs/.${ipfsnodeid}/CONTACT/${g1author} diff --git a/zen/zen_MAKE.sh b/zen/zen_MAKE.sh index e599de4..1cbf8bc 100755 --- a/zen/zen_MAKE.sh +++ b/zen/zen_MAKE.sh @@ -322,6 +322,7 @@ if [[ "${PASSENGERNAME}" != "" ]]; then youtubeid=$(cat "$METADATA" | jq -r '.id') fulltitle=$(cat "$METADATA" | jq -r '.fulltitle') + echo "$fulltitle" > ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/_tag.passenger.fulltitle # description=$(cat "$METADATA" | jq -r '.description') artist=$(cat "$METADATA" | jq -r '.artist') album=$(cat "$METADATA" | jq -r '.album') @@ -399,14 +400,15 @@ if [[ "${PASSENGERNAME}" != "" ]]; then export MESSAGE=$(cat << EOF #${extractor}:${duration}:${uploader_id} [![ssb_thumb.jpg](${id})](http://127.0.0.1:8080/ipfs/$IPASSENGER/$PASSENGERNAME) -#${fulltitle} - -[:pig_nose:_IPFS_:pig_nose:](http://127.0.0.1:8080/ipfs/$IPASSENGER/$PASSENGERNAME) +:hash:#${fulltitle} +[:pig:IPFS:pig_nose:](http://127.0.0.1:8080/ipfs/$IPASSENGER/$PASSENGERNAME) +--- **ZEN=$ZEN($READ/$PARK)** +[:flying_saucer:Zen:heart:CONTRACT(s):file_folder:](http://127.0.0.1:8080/ipns/${J}) -[ZenCONTRACT](http://127.0.0.1:8080/ipns/${J}) +[:sunglasses:**BLOB**:pager:](http://127.0.0.1:8080/ipns/$ipfsnodeid/.$ipfsnodeid/TAG/${ZENSOURCE}) #zenbot #astroport