|
@@ -41,6 +41,7 @@ WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh"
|
41
|
41
|
TRACKER_PORT=6969
|
42
|
42
|
ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet
|
43
|
43
|
MY_USERNAME=$USER
|
|
44
|
+MESH_USERNAME='fbone'
|
44
|
45
|
|
45
|
46
|
BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs
|
46
|
47
|
MAIL_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-mail
|
|
@@ -119,18 +120,20 @@ function detect_new_tox_users {
|
119
|
120
|
fi
|
120
|
121
|
|
121
|
122
|
# Check that this is a GUI installation with a desktop
|
122
|
|
- if [ ! -d /home/fbone/Desktop ]; then
|
|
123
|
+ if [ ! -d /home/$MESH_USERNAME/Desktop ]; then
|
123
|
124
|
return
|
124
|
125
|
fi
|
125
|
126
|
|
126
|
127
|
# Produce notifications if new users appear
|
127
|
128
|
if [ -f $PREV_TOX_USERS_FILE ]; then
|
128
|
129
|
while IFS='' read -r line || [[ -n "$line" ]]; do
|
129
|
|
- if ! grep -q "$line" $PREV_TOX_USERS_FILE; then
|
130
|
|
- # get the nick of the user
|
131
|
|
- toxuser="$(echo "$line" | awk -F ' ' '{print $1}')"
|
|
130
|
+ if [[ $line != "Failed*" && $line != "data "* ]]; then
|
|
131
|
+ if ! grep -q "$line" $PREV_TOX_USERS_FILE; then
|
|
132
|
+ # get the nick of the user
|
|
133
|
+ toxuser="$(echo "$line" | awk -F ' ' '{print $1}')"
|
132
|
134
|
|
133
|
|
- notify-send $"$PROJECT_NAME mesh" $"$toxuser has joined the mesh" --icon=dialog-information
|
|
135
|
+ notify-send $"$PROJECT_NAME mesh" $"$toxuser has joined the mesh" --icon=dialog-information
|
|
136
|
+ fi
|
134
|
137
|
fi
|
135
|
138
|
done < "$CURRENT_USERS_FILE"
|
136
|
139
|
fi
|