free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No zeronet user directory

This commit is contained in:
Bob Mottram 2016-07-16 17:43:31 +01:00
parent 42f3e56087
commit 97411dfd7d
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-meshweb
View File

@ -60,7 +60,7 @@ if [ ${ctr} -lt "1" ]; then
exit 0 exit 0
fi fi
ZERONET_INDEX=/home/$MY_USERNAME/mesh.html ZERONET_INDEX=$MESH_INSTALL_DIR/zeronet/mesh.html
if which firefox > /dev/null; then if which firefox > /dev/null; then
firefox $ZERONET_INDEX firefox $ZERONET_INDEX

21
src/zeronetavahi
View File

@ -40,22 +40,13 @@ MESH_INSTALL_DIR=/var/lib
WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh" WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh"
TRACKER_PORT=6969 TRACKER_PORT=6969
ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet
ZERONET_USER_HOME=/home/zeronet
MY_USERNAME=$USER MY_USERNAME=$USER
if [ ! -d $ZERONET_INSTALL ]; then
if [ -d /home/$MY_USERNAME/zeronet ]; then
ZERONET_INSTALL=/home/$MY_USERNAME/zeronet
else
exit 0
fi
fi
BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs
MAIL_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-mail MAIL_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-mail
FORUM_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-fora FORUM_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-fora
TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users
ZERONET_INDEX=/home/$MY_USERNAME/mesh.html ZERONET_INDEX=$ZERONET_INSTALL/mesh.html
ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
IPFS_PORT=4001 IPFS_PORT=4001
@ -361,7 +352,7 @@ function zeronet_update_config {
fi fi
fi fi
rm -f $ZERONET_CONFIG.new rm -f $ZERONET_CONFIG.new
if [ -d $ZERONET_USER_HOME ]; then if [ -d $ZERONET_INSTALL ]; then
sudo chown zeronet:zeronet $ZERONET_CONFIG sudo chown zeronet:zeronet $ZERONET_CONFIG
fi fi
} }
@ -393,9 +384,9 @@ create_footer $TOX_USERS_FILE
# make the index page # make the index page
create_index create_index
assemble_web_page ${BLOGS_FILE} $ZERONET_USER_HOME assemble_web_page ${BLOGS_FILE} $ZERONET_INSTALL
assemble_web_page ${MAIL_FILE} $ZERONET_USER_HOME assemble_web_page ${MAIL_FILE} $ZERONET_INSTALL
assemble_web_page ${FORUM_FILE} $ZERONET_USER_HOME assemble_web_page ${FORUM_FILE} $ZERONET_INSTALL
assemble_web_page ${TOX_USERS_FILE} $ZERONET_USER_HOME assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
exit 0 exit 0