Browse Source

No zeronet user directory

Bob Mottram 9 years ago
parent
commit
97411dfd7d
2 changed files with 7 additions and 16 deletions
  1. 1
    1
      src/freedombone-meshweb
  2. 6
    15
      src/zeronetavahi

+ 1
- 1
src/freedombone-meshweb View File

60
    exit 0
60
    exit 0
61
 fi
61
 fi
62
 
62
 
63
-ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
63
+ZERONET_INDEX=$MESH_INSTALL_DIR/zeronet/mesh.html
64
 
64
 
65
 if which firefox > /dev/null; then
65
 if which firefox > /dev/null; then
66
     firefox $ZERONET_INDEX
66
     firefox $ZERONET_INDEX

+ 6
- 15
src/zeronetavahi View File

40
 WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh"
40
 WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh"
41
 TRACKER_PORT=6969
41
 TRACKER_PORT=6969
42
 ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet
42
 ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet
43
-ZERONET_USER_HOME=/home/zeronet
44
 MY_USERNAME=$USER
43
 MY_USERNAME=$USER
45
 
44
 
46
-if [ ! -d $ZERONET_INSTALL ]; then
47
-	if [ -d /home/$MY_USERNAME/zeronet ]; then
48
-		ZERONET_INSTALL=/home/$MY_USERNAME/zeronet
49
-	else
50
-		exit 0
51
-	fi
52
-fi
53
-
54
 BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs
45
 BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs
55
 MAIL_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-mail
46
 MAIL_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-mail
56
 FORUM_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-fora
47
 FORUM_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-fora
57
 TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users
48
 TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users
58
-ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
49
+ZERONET_INDEX=$ZERONET_INSTALL/mesh.html
59
 ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
50
 ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
60
 
51
 
61
 IPFS_PORT=4001
52
 IPFS_PORT=4001
361
 		fi
352
 		fi
362
 	fi
353
 	fi
363
 	rm -f $ZERONET_CONFIG.new
354
 	rm -f $ZERONET_CONFIG.new
364
-	if [ -d $ZERONET_USER_HOME ]; then
355
+	if [ -d $ZERONET_INSTALL ]; then
365
 		sudo chown zeronet:zeronet $ZERONET_CONFIG
356
 		sudo chown zeronet:zeronet $ZERONET_CONFIG
366
 	fi
357
 	fi
367
 }
358
 }
393
 # make the index page
384
 # make the index page
394
 create_index
385
 create_index
395
 
386
 
396
-assemble_web_page ${BLOGS_FILE} $ZERONET_USER_HOME
397
-assemble_web_page ${MAIL_FILE} $ZERONET_USER_HOME
398
-assemble_web_page ${FORUM_FILE} $ZERONET_USER_HOME
399
-assemble_web_page ${TOX_USERS_FILE} $ZERONET_USER_HOME
387
+assemble_web_page ${BLOGS_FILE} $ZERONET_INSTALL
388
+assemble_web_page ${MAIL_FILE} $ZERONET_INSTALL
389
+assemble_web_page ${FORUM_FILE} $ZERONET_INSTALL
390
+assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
400
 
391
 
401
 exit 0
392
 exit 0