Browse Source

Open index page

Bob Mottram 9 years ago
parent
commit
0c9a609485
1 changed files with 31 additions and 2 deletions
  1. 31
    2
      src/freedombone-meshweb

+ 31
- 2
src/freedombone-meshweb View File

@@ -43,6 +43,20 @@ function install_zeronet_blog {
43 43
     ZERONET_BLOG_ADDRESS=${blog_address//[[:blank:]]/}
44 44
     ZERONET_BLOG_PRIVATE_KEY=${blog_private_key//[[:blank:]]/}
45 45
 
46
+    if [ ${#ZERONET_BLOG_ADDRESS} -lt 20 ]; then
47
+        echo "Address:    $ZERONET_BLOG_ADDRESS"
48
+        echo "Public key: $ZERONET_BLOG_PRIVATE_KEY"
49
+        echo 'Unable to create zeronet blog address'
50
+        exit 7358
51
+    fi
52
+
53
+    if [ ${#ZERONET_BLOG_PRIVATE_KEY} -lt 20 ]; then
54
+        echo "Address:    $ZERONET_BLOG_ADDRESS"
55
+        echo "Public key: $ZERONET_BLOG_PRIVATE_KEY"
56
+        echo 'Unable to create zeronet blog private key'
57
+        exit 1639
58
+    fi
59
+
46 60
     if [ ! -d "$ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS" ]; then
47 61
         echo "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_BLOG_ADDRESS"
48 62
         exit 7638
@@ -105,6 +119,20 @@ function install_zeronet_forum {
105 119
     ZERONET_FORUM_ADDRESS=${forum_address//[[:blank:]]/}
106 120
     ZERONET_FORUM_PRIVATE_KEY=${forum_private_key//[[:blank:]]/}
107 121
 
122
+    if [ ${#ZERONET_FORUM_ADDRESS} -lt 20 ]; then
123
+        echo "Address:    $ZERONET_FORUM_ADDRESS"
124
+        echo "Public key: $ZERONET_FORUM_PRIVATE_KEY"
125
+        echo 'Unable to create zeronet forum address'
126
+        exit 76352
127
+    fi
128
+
129
+    if [ ${#ZERONET_FORUM_PRIVATE_KEY} -lt 20 ]; then
130
+        echo "Address:    $ZERONET_FORUM_ADDRESS"
131
+        echo "Public key: $ZERONET_FORUM_PRIVATE_KEY"
132
+        echo 'Unable to create zeronet forum private key'
133
+        exit 87356
134
+    fi
135
+
108 136
     if [ ! -d "$ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS" ]; then
109 137
         echo "Unable to find site directory: $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS"
110 138
         exit 7638
@@ -241,10 +269,11 @@ if [ $existing_zeronet -lt "2" ]; then
241 269
     python zeronet.py &
242 270
 fi
243 271
 
272
+ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
244 273
 if which xdg-open > /dev/null; then
245
-    xdg-open $ZERONET_URL
274
+    xdg-open file://$ZERONET_INDEX
246 275
 elif which gnome-open > /dev/null; then
247
-    gnome-open $ZERONET_URL
276
+    gnome-open file://$ZERONET_INDEX
248 277
 fi
249 278
 
250 279
 exit 0