Bob Mottram пре 9 година
родитељ
комит
185524a8f0
1 измењених фајлова са 33 додато и 22 уклоњено
  1. 33
    22
      src/zeronetavahi

+ 33
- 22
src/zeronetavahi Прегледај датотеку

@@ -36,7 +36,7 @@ PROJECT_NAME='freedombone'
36 36
 export TEXTDOMAIN=$PROJECT_NAME
37 37
 export TEXTDOMAINDIR="/usr/share/locale"
38 38
 
39
-WEB_PAGE_TITLE="Freedombone Mesh"
39
+WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh"
40 40
 TRACKER_PORT=6969
41 41
 ZERONET_INSTALL=/opt/zeronet
42 42
 ZERONET_USER_HOME=/home/zeronet
@@ -59,11 +59,22 @@ ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
59 59
 
60 60
 IPFS_PORT=4001
61 61
 
62
+MY_BLOG_STR=$"My Blog"
63
+MY_MAIL_STR=$"My Mail"
64
+MY_FORUM_STR=$"My Forum"
65
+BLOGS_STR=$"Blogs"
66
+MAIL_STR=$"Mail"
67
+FORA_STR=$"Fora"
68
+ZERONET_BLOG_STR=$"ZeroNet Blog"
69
+ZERONET_MAIL_STR=$"ZeroNet Mail"
70
+ZERONET_FORUM_STR=$"ZeroNet Forum"
71
+NO_USERS_STR=$"No users found"
72
+
62 73
 function create_index {
63 74
     if [ -f $ZERONET_INDEX ]; then
64
-        sed -i "s|.*My Blog.*|  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myblog)\">My Blog</a></li>|g" $ZERONET_INDEX
65
-        sed -i "s|.*My Mail.*|  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/mymail)\">My Mail</a></li>|g" $ZERONET_INDEX
66
-        sed -i "s|.*My Forum.*|  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myforum)\">My Forum</a></li>|g" $ZERONET_INDEX
75
+        sed -i "s|.*${MY_BLOG_STR}.*|  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myblog)\">${MY_BLOG_STR}</a></li>|g" $ZERONET_INDEX
76
+        sed -i "s|.*${MY_MAIL_STR}.*|  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/mymail)\">${MY_MAIL_STR}</a></li>|g" $ZERONET_INDEX
77
+        sed -i "s|.*${MY_FORUM_STR}.*|  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myforum)\">${MY_FORUM_STR}</a></li>|g" $ZERONET_INDEX
67 78
         return
68 79
     fi
69 80
     echo '<!DOCTYPE html>' > $ZERONET_INDEX
@@ -77,18 +88,18 @@ function create_index {
77 88
     echo "<H2>Your Sites</H2>" >> $ZERONET_INDEX
78 89
     echo '' >> $ZERONET_INDEX
79 90
     echo '<ol type="square">' >> $ZERONET_INDEX
80
-    echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myblog)\">My Blog</a></li>" >> $ZERONET_INDEX
81
-    echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/mymail)\">My Mail</a></li>" >> $ZERONET_INDEX
82
-    echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myforum)\">My Forum</a></li>" >> $ZERONET_INDEX
83
-    echo "  <li><a href=\"http://localhost:5001/webui\">File Share</a></li>" >> $ZERONET_INDEX
91
+    echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myblog)\">${MY_BLOG_STR}</a></li>" >> $ZERONET_INDEX
92
+    echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/mymail)\">${MY_MAIL_STR}</a></li>" >> $ZERONET_INDEX
93
+    echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myforum)\">${MY_FORUM_STR}</a></li>" >> $ZERONET_INDEX
94
+#    echo "  <li><a href=\"http://localhost:5001/webui\">File Share</a></li>" >> $ZERONET_INDEX
84 95
     echo '</ol>' >> $ZERONET_INDEX
85 96
     echo '' >> $ZERONET_INDEX
86 97
     echo "<H2>On the Mesh</H2>" >> $ZERONET_INDEX
87 98
     echo '' >> $ZERONET_INDEX
88 99
     echo '<ol type="square">' >> $ZERONET_INDEX
89
-    echo "  <li><a href=\"${BLOGS_FILE}.html\">Blogs</a></li>" >> $ZERONET_INDEX
90
-    echo "  <li><a href=\"${MAIL_FILE}.html\">Mail</a></li>" >> $ZERONET_INDEX
91
-    echo "  <li><a href=\"${FORUM_FILE}.html\">Fora</a></li>" >> $ZERONET_INDEX
100
+    echo "  <li><a href=\"${BLOGS_FILE}.html\">${BLOGS_STR}</a></li>" >> $ZERONET_INDEX
101
+    echo "  <li><a href=\"${MAIL_FILE}.html\">${MAIL_STR}</a></li>" >> $ZERONET_INDEX
102
+    echo "  <li><a href=\"${FORUM_FILE}.html\">${FORA_STR}</a></li>" >> $ZERONET_INDEX
92 103
     echo "  <li><a href=\"${TOX_USERS_FILE}.html\">Tox Users</a></li>" >> $ZERONET_INDEX
93 104
     echo '</ol>' >> $ZERONET_INDEX
94 105
     echo '' >> $ZERONET_INDEX
@@ -166,7 +177,7 @@ if [ -f $BLOGS_FILE.new ]; then
166 177
     rm -f $BLOGS_FILE.new
167 178
 fi
168 179
 
169
-cat $TEMPFILE_BASE | grep "ZeroNet Blog\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
180
+cat $TEMPFILE_BASE | grep "${ZERONET_BLOG_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
170 181
 
171 182
 state=0
172 183
 address=""
@@ -192,7 +203,7 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
192 203
             state=2
193 204
         fi
194 205
     fi
195
-    if [[ $line == *"ZeroNet Blog"* && $line == "= "* ]]; then
206
+    if [[ $line == *"${ZERONET_BLOG_STR}"* && $line == "= "* ]]; then
196 207
         state=1
197 208
     fi
198 209
 done < "$TEMPFILE"
@@ -204,7 +215,7 @@ if [ -f $MAIL_FILE.new ]; then
204 215
     rm -f $MAIL_FILE.new
205 216
 fi
206 217
 
207
-cat $TEMPFILE_BASE | grep "ZeroNet Mail\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
218
+cat $TEMPFILE_BASE | grep "${ZERONET_MAIL_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
208 219
 
209 220
 state=0
210 221
 address=""
@@ -230,7 +241,7 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
230 241
             state=2
231 242
         fi
232 243
     fi
233
-    if [[ $line == *"ZeroNet Mail"* && $line == "= "* ]]; then
244
+    if [[ $line == *"${ZERONET_MAIL_STR}"* && $line == "= "* ]]; then
234 245
         state=1
235 246
     fi
236 247
 done < "$TEMPFILE"
@@ -242,7 +253,7 @@ if [ -f $FORUM_FILE.new ]; then
242 253
     rm -f $FORUM_FILE.new
243 254
 fi
244 255
 
245
-cat $TEMPFILE_BASE | grep "ZeroNet Forum\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
256
+cat $TEMPFILE_BASE | grep "${ZERONET_FORUM_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
246 257
 
247 258
 state=0
248 259
 address=""
@@ -268,7 +279,7 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
268 279
             state=2
269 280
         fi
270 281
     fi
271
-    if [[ $line == *"ZeroNet Forum"* && $line == "= "* ]]; then
282
+    if [[ $line == *"${ZERONET_FORUM_STR}"* && $line == "= "* ]]; then
272 283
         state=1
273 284
     fi
274 285
 done < "$TEMPFILE"
@@ -318,7 +329,7 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
318 329
     fi
319 330
 done < "$TEMPFILE"
320 331
 if [ $toxctr -eq "0" ]; then
321
-    echo "  <li>No users found</li>" >> $TOX_USERS_FILE.new
332
+    echo "  <li>${NO_USERS_STR}</li>" >> $TOX_USERS_FILE.new
322 333
 fi
323 334
 echo '<ol>' >> $TOX_USERS_FILE.new
324 335
 
@@ -339,10 +350,10 @@ if [ -d $ZERONET_USER_HOME ]; then
339 350
 fi
340 351
 
341 352
 # make some html headers and footers
342
-create_header $BLOGS_FILE "Blogs"
343
-create_header $MAIL_FILE "Mail"
344
-create_header $FORUM_FILE "Fora"
345
-create_header $TOX_USERS_FILE "Tox Users"
353
+create_header $BLOGS_FILE $BLOGS_STR
354
+create_header $MAIL_FILE $MAIL_STR
355
+create_header $FORUM_FILE $FORA_STR
356
+create_header $TOX_USERS_FILE $"Tox Users"
346 357
 create_footer $BLOGS_FILE
347 358
 create_footer $MAIL_FILE
348 359
 create_footer $FORUM_FILE