| 
				
			 | 
			
			
				@@ -9,10 +9,102 @@ SERVER_INSTALLATION="no" 
			 | 
		
	
		
			
			| 
				9
			 | 
			
				9
			 | 
			
			
				 PEERS_FILE=/tmp/meshwebstart 
			 | 
		
	
		
			
			| 
				10
			 | 
			
				10
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				11
			 | 
			
				11
			 | 
			
			
				 ZERONET_REPO='https://github.com/bashrc/ZeroNet' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				12
			 | 
			
			
				+ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				13
			 | 
			
			
				+ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk' 
			 | 
		
	
		
			
			| 
				12
			 | 
			
				14
			 | 
			
			
				 ZERONET_DIR=~/zeronet 
			 | 
		
	
		
			
			| 
				13
			 | 
			
				15
			 | 
			
			
				 ZERONET_URL=http://127.0.0.1:43110 
			 | 
		
	
		
			
			| 
				14
			 | 
			
				16
			 | 
			
			
				 TRACKER_PORT=6969 
			 | 
		
	
		
			
			| 
				15
			 | 
			
				17
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
			 | 
			
				18
			 | 
			
			
				+MY_USERNAME=$USER 
			 | 
		
	
		
			
			| 
				
			 | 
			
				19
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				20
			 | 
			
			
				+function install_zeronet_blog { 
			 | 
		
	
		
			
			| 
				
			 | 
			
				21
			 | 
			
			
				+    if [ ! -f /home/$MY_USERNAME/README ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				22
			 | 
			
			
				+        touch /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				23
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				24
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				25
			 | 
			
			
				+    if grep -q "ZeroNet Blog address" /home/$MY_USERNAME/README; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				26
			 | 
			
			
				+        return 
			 | 
		
	
		
			
			| 
				
			 | 
			
				27
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				28
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				29
			 | 
			
			
				+    cd $ZERONET_DIR 
			 | 
		
	
		
			
			| 
				
			 | 
			
				30
			 | 
			
			
				+    python zeronet.py --batch siteCreate 2> $ZERONET_DIR/blog.txt 
			 | 
		
	
		
			
			| 
				
			 | 
			
				31
			 | 
			
			
				+    if [ ! -f $ZERONET_DIR/blog.txt ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				32
			 | 
			
			
				+        echo 'Unable to create blog' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				33
			 | 
			
			
				+        exit 479 
			 | 
		
	
		
			
			| 
				
			 | 
			
				34
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				35
			 | 
			
			
				+    blog_address=$(cat blog.txt | grep "Site address" | awk -F ':' '{print $2}') 
			 | 
		
	
		
			
			| 
				
			 | 
			
				36
			 | 
			
			
				+    blog_private_key=$(cat blog.txt | grep "Site private key" | awk -F ':' '{print $2}') 
			 | 
		
	
		
			
			| 
				
			 | 
			
				37
			 | 
			
			
				+    ZERONET_BLOG_ADDRESS=${blog_address//[[:blank:]]/} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				38
			 | 
			
			
				+    ZERONET_BLOG_PRIVATE_KEY=${blog_private_key//[[:blank:]]/} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				39
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				40
			 | 
			
			
				+    if [ ! -d "$ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS" ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				41
			 | 
			
			
				+        echo "Unable to find site directory: $$ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				42
			 | 
			
			
				+        exit 7638 
			 | 
		
	
		
			
			| 
				
			 | 
			
				43
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				44
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				45
			 | 
			
			
				+    git clone $ZERONET_BLOG_REPO ZeroBlog 
			 | 
		
	
		
			
			| 
				
			 | 
			
				46
			 | 
			
			
				+    if [ ! -d $ZERONET_DIR/ZeroBlog ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				47
			 | 
			
			
				+        echo 'ZeroBlog repo could not be cloned' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				48
			 | 
			
			
				+        exit 6739 
			 | 
		
	
		
			
			| 
				
			 | 
			
				49
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				50
			 | 
			
			
				+    echo "Blog address:     $ZERONET_BLOG_ADDRESS" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				51
			 | 
			
			
				+    echo "Blog private key: $ZERONET_BLOG_PRIVATE_KEY" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				52
			 | 
			
			
				+    cp -r $ZERONET_DIR/ZeroBlog/* $ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS 
			 | 
		
	
		
			
			| 
				
			 | 
			
				53
			 | 
			
			
				+    python zeronet.py siteSign $ZERONET_BLOG_ADDRESS $ZERONET_BLOG_PRIVATE_KEY 
			 | 
		
	
		
			
			| 
				
			 | 
			
				54
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				55
			 | 
			
			
				+    if ! grep -q "ZeroNet Blog address" /home/$MY_USERNAME/README; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				56
			 | 
			
			
				+        echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				57
			 | 
			
			
				+        echo "ZeroNet Blog address: $ZERONET_BLOG_ADDRESS" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				58
			 | 
			
			
				+        echo "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				59
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				60
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				61
			 | 
			
			
				+    echo 'Zeronet blog installed' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				62
			 | 
			
			
				+} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				63
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				64
			 | 
			
			
				+function install_zeronet_forum { 
			 | 
		
	
		
			
			| 
				
			 | 
			
				65
			 | 
			
			
				+    if [ ! -f /home/$MY_USERNAME/README ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				66
			 | 
			
			
				+        touch /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				67
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				68
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				69
			 | 
			
			
				+    if grep -q "ZeroNet Forum address" /home/$MY_USERNAME/README; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				70
			 | 
			
			
				+        return 
			 | 
		
	
		
			
			| 
				
			 | 
			
				71
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				72
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				73
			 | 
			
			
				+    cd $ZERONET_DIR 
			 | 
		
	
		
			
			| 
				
			 | 
			
				74
			 | 
			
			
				+    python zeronet.py --batch siteCreate 2> $ZERONET_DIR/forum.txt 
			 | 
		
	
		
			
			| 
				
			 | 
			
				75
			 | 
			
			
				+    if [ ! -f $ZERONET_DIR/forum.txt ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				76
			 | 
			
			
				+        echo 'Unable to create forum' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				77
			 | 
			
			
				+        exit 479 
			 | 
		
	
		
			
			| 
				
			 | 
			
				78
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				79
			 | 
			
			
				+    forum_address=$(cat forum.txt | grep "Site address" | awk -F ':' '{print $2}') 
			 | 
		
	
		
			
			| 
				
			 | 
			
				80
			 | 
			
			
				+    forum_private_key=$(cat forum.txt | grep "Site private key" | awk -F ':' '{print $2}') 
			 | 
		
	
		
			
			| 
				
			 | 
			
				81
			 | 
			
			
				+    ZERONET_FORUM_ADDRESS=${forum_address//[[:blank:]]/} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				82
			 | 
			
			
				+    ZERONET_FORUM_PRIVATE_KEY=${forum_private_key//[[:blank:]]/} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				83
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				84
			 | 
			
			
				+    if [ ! -d "$ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS" ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				85
			 | 
			
			
				+        echo "Unable to find site directory: $$ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				86
			 | 
			
			
				+        exit 7638 
			 | 
		
	
		
			
			| 
				
			 | 
			
				87
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				88
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				89
			 | 
			
			
				+    git clone $ZERONET_FORUM_REPO ZeroTalk 
			 | 
		
	
		
			
			| 
				
			 | 
			
				90
			 | 
			
			
				+    if [ ! -d $ZERONET_DIR/ZeroTalk ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				91
			 | 
			
			
				+        echo 'ZeroTalk repo could not be cloned' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				92
			 | 
			
			
				+        exit 6739 
			 | 
		
	
		
			
			| 
				
			 | 
			
				93
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				94
			 | 
			
			
				+    echo "Forum address:     $ZERONET_FORUM_ADDRESS" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				95
			 | 
			
			
				+    echo "Forum private key: $ZERONET_FORUM_PRIVATE_KEY" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				96
			 | 
			
			
				+    cp -r $ZERONET_DIR/ZeroTalk/* $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS 
			 | 
		
	
		
			
			| 
				
			 | 
			
				97
			 | 
			
			
				+    python zeronet.py siteSign $ZERONET_FORUM_ADDRESS $ZERONET_FORUM_PRIVATE_KEY 
			 | 
		
	
		
			
			| 
				
			 | 
			
				98
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				99
			 | 
			
			
				+    if ! grep -q "ZeroNet Forum address" /home/$MY_USERNAME/README; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				100
			 | 
			
			
				+        echo '' >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				101
			 | 
			
			
				+        echo "ZeroNet Forum address: $ZERONET_FORUM_ADDRESS" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				102
			 | 
			
			
				+        echo "ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY" >> /home/$MY_USERNAME/README 
			 | 
		
	
		
			
			| 
				
			 | 
			
				103
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				104
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				105
			 | 
			
			
				+    echo 'Zeronet forum installed' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				106
			 | 
			
			
				+} 
			 | 
		
	
		
			
			| 
				
			 | 
			
				107
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				16
			 | 
			
				108
			 | 
			
			
				 function install_web_server { 
			 | 
		
	
		
			
			| 
				17
			 | 
			
				109
			 | 
			
			
				     if [ -d /etc/nginx ]; then 
			 | 
		
	
		
			
			| 
				18
			 | 
			
				110
			 | 
			
			
				         return 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -45,7 +137,6 @@ function install_zeronet { 
			 | 
		
	
		
			
			| 
				45
			 | 
			
				137
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				46
			 | 
			
				138
			 | 
			
			
				   cd $ZERONET_DIR 
			 | 
		
	
		
			
			| 
				47
			 | 
			
				139
			 | 
			
			
				   git checkout bashrc/bootstrap-file 
			 | 
		
	
		
			
			| 
				48
			 | 
			
				
			 | 
			
			
				-  #git checkout bashrc/test 
			 | 
		
	
		
			
			| 
				49
			 | 
			
				140
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				50
			 | 
			
				141
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				51
			 | 
			
				142
			 | 
			
			
				 if [ -f /var/lib/batman ]; then 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -63,6 +154,8 @@ if [[ $SERVER_INSTALLATION == "no" ]]; then 
			 | 
		
	
		
			
			| 
				63
			 | 
			
				154
			 | 
			
			
				         sudo apt-get update 
			 | 
		
	
		
			
			| 
				64
			 | 
			
				155
			 | 
			
			
				         install_web_server 
			 | 
		
	
		
			
			| 
				65
			 | 
			
				156
			 | 
			
			
				         install_zeronet 
			 | 
		
	
		
			
			| 
				
			 | 
			
				157
			 | 
			
			
				+        install_zeronet_blog 
			 | 
		
	
		
			
			| 
				
			 | 
			
				158
			 | 
			
			
				+        install_zeronet_forum 
			 | 
		
	
		
			
			| 
				66
			 | 
			
				159
			 | 
			
			
				         sudo batman start 
			 | 
		
	
		
			
			| 
				67
			 | 
			
				160
			 | 
			
			
				         if [ ! "$?" = "0" ]; then 
			 | 
		
	
		
			
			| 
				68
			 | 
			
				161
			 | 
			
			
				             exit 2 
			 |