diff --git a/install.sh b/install.sh index e0c56766..48e29dc2 100755 --- a/install.sh +++ b/install.sh @@ -46,7 +46,7 @@ sudo apt-get update echo "#############################################" echo "######### INSTALL PRECIOUS FREE SOFTWARE ####" echo "#############################################" -for i in git tldr make cmake docker-compose fail2ban npm shellcheck multitail netcat-traditional ncdu chromium miller inotify-tools curl net-tools mosquitto libsodium* libcurl4-openssl-dev; do +for i in git tldr make cmake docker docker-compose fail2ban npm shellcheck multitail netcat-traditional ncdu chromium miller inotify-tools curl net-tools mosquitto libsodium* libcurl4-openssl-dev; do if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then echo ">>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" sudo apt install -y $i diff --git a/templates/P4N/index.html b/templates/P4N/index.html index 37f7d9fb..0a216ede 100644 --- a/templates/P4N/index.html +++ b/templates/P4N/index.html @@ -151,11 +151,11 @@ axios.get('./wallets.json') if (isMember) { // Member ID - popupContent += `
* Forgeron`; + popupContent += `
* Forgeron`; } else { // Merchant ID popupContent += `
* Gchange`; - popupContent += `
* Cesium`; + popupContent += `
* Cesium`; popupContent += `
* + TW +`; } diff --git a/tools/search_for_this_email_in_players.sh b/tools/search_for_this_email_in_players.sh index ee689e35..9de050be 100755 --- a/tools/search_for_this_email_in_players.sh +++ b/tools/search_for_this_email_in_players.sh @@ -33,7 +33,7 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then EXTERNAL=$(grep -o "url='/[^']*'" ${INDEX} | sed "s/url='\(.*\)'/\1/" | awk -F"/" '{print $3}') [[ ! -s $HOME/.zen/tmp/flashmem/tw/${EXTERNAL}/index.html ]] \ && mkdir -p $HOME/.zen/tmp/flashmem/tw/${EXTERNAL} \ - && ipfs --timeout=42s cat /ipfs/${EXTERNAL} > $HOME/.zen/tmp/flashmem/tw/${EXTERNAL}/index.html \ + && ipfs --timeout=42s cat --progress=false /ipfs/${EXTERNAL} > $HOME/.zen/tmp/flashmem/tw/${EXTERNAL}/index.html \ || INDEX="" INDEX="$HOME/.zen/tmp/flashmem/tw/${EXTERNAL}/index.html" fi @@ -68,6 +68,9 @@ else fi +[[ $XDG_SESSION_TYPE == 'x11' ]] \ + && xdg-open http://127.0.0.1:8080${ASTRONAUTENS} + ### RUN THIS $(SCRIPT) TO INITIALIZE PLAYER ENV echo "export ASTROPORT=$ASTROPORT ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS TW=$INDEX source=$source" exit 0