diff --git a/start.sh b/start.sh index 6e5819f4..2cc177aa 100755 --- a/start.sh +++ b/start.sh @@ -22,7 +22,8 @@ Ambassade numérique pair à pair sur IPFS. ASTROPORT VISA : MadeInZion @@@@@@@@@@@@@@@@@@' -source ~/.zen/ipfs.sync; echo "CAPTAIN is $CAPTAIN" +source ~/.zen/ipfs.sync 2>/dev/null +echo "CAPTAIN is $CAPTAIN" echo @@ -32,8 +33,8 @@ YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail [[ ! $YOU ]] && echo "Lancez 'ipfs daemon' SVP" && exit 1 ## CREATE AND OR CONNECT USER - PS3='Créez votre nouveau VISA ou selectionner votre Astronaute ... ' - players=("NOUVEAU VISA" $(ls ~/.zen/game/players)) + PS3='Créez votre nouveau VISA ou selectionner un compte Astronaute existant' + players=("NOUVEAU VISA" $(ls ~/.zen/game/players 2>/dev/null)) select fav in "${players[@]}"; do case $fav in "NOUVEAU VISA") @@ -71,7 +72,7 @@ echo "____________________"; ${MY_PATH}/tools/PLAYER.entrance.sh ## Switch IPFS Layer with Astronaut ID & astrXbian data index structure echo PS3="$PLAYER choisissez une action à mener : " -choices=("WEBCAM" "JOURNAUX" "IMPRIMER VISA" "EXPORTER VISA" "SUPPRIMER VISA" "QUITTER") +choices=("AJOUTER MEDIA" "JOURNAUX" "IMPRIMER VISA" "EXPORTER VISA" "SUPPRIMER VISA" "QUITTER") select fav in "${choices[@]}"; do case $fav in "IMPRIMER VISA") @@ -97,9 +98,10 @@ select fav in "${choices[@]}"; do break ;; - "WEBCAM") + "AJOUTER MEDIA") echo "VIDEOBLOG" - ${MY_PATH}/tools/vlc_webcam.sh + # ${MY_PATH}/tools/vlc_webcam.sh + ~/.zen/astrXbian/ajouter_video.sh ;; "JOURNAUX") diff --git a/tools/PLAYER.entrance.sh b/tools/PLAYER.entrance.sh index 19cd32ce..f279c0fd 100755 --- a/tools/PLAYER.entrance.sh +++ b/tools/PLAYER.entrance.sh @@ -60,7 +60,7 @@ echo "==== qo-op & moa Captain/Station keystore ===="; sleep 2 ln -s ~/.zen/game/players/$PLAYER/keystore ~/.ipfs/keystore # Keep already created keys !!? - cp ~/.ipfs/keystore.astrXbian.${PLAYER}.${MOATS}/* ~/.ipfs/keystore/ 2>/dev/null + cp ~/.ipfs/keystore.astrXbian/* ~/.ipfs/keystore/ 2>/dev/null ################################################################################### # 'tokenring' Key there? TOKENRING IS A SHARED KEY TO KNOW WHO IS NEXT IN MY FRIEND TO WRITE COMMON CHANNEL # In case of corruption... Swarm goes into DEFCON 3 procedure and eject "bad friend"