浏览代码

Missing username

Bob Mottram 8 年前
父节点
当前提交
6a0ccd1774
共有 2 个文件被更改,包括 27 次插入27 次删除
  1. 1
    1
      src/freedombone-image-customise
  2. 26
    26
      src/freedombone-image-mesh

+ 1
- 1
src/freedombone-image-customise 查看文件

@@ -545,7 +545,7 @@ initialise_mesh() {
545 545
 	echo 'User=root' >> $MESH_SETUP_DAEMON
546 546
 	echo 'Group=root' >> $MESH_SETUP_DAEMON
547 547
 	echo 'WorkingDirectory=/root' >> $MESH_SETUP_DAEMON
548
-	echo "ExecStart=/usr/local/bin/${PROJECT_NAME}-image-mesh > /var/log/mesh-setup.log" >> $MESH_SETUP_DAEMON
548
+	echo "ExecStart=/usr/local/bin/${PROJECT_NAME}-image-mesh ${MY_USERNAME} > /var/log/mesh-setup.log" >> $MESH_SETUP_DAEMON
549 549
 	echo '' >> $MESH_SETUP_DAEMON
550 550
 	echo 'TimeoutSec=99999' >> $MESH_SETUP_DAEMON
551 551
 	echo '' >> $MESH_SETUP_DAEMON

+ 26
- 26
src/freedombone-image-mesh 查看文件

@@ -152,14 +152,14 @@ function configure_zeronet_blog {
152 152
 	echo '</service-group>' >> /tmp/zeronet-blog.service
153 153
 	cp /tmp/zeronet-blog.service /etc/avahi/services/zeronet-blog.service
154 154
 
155
-	if [ ! -d /home/$MY_USERNAME/.config/zeronet ]; then
156
-		mkdir -p /home/$MY_USERNAME/.config/zeronet
157
-		chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
155
+	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
156
+		mkdir -p /home/${MY_USERNAME}/.config/zeronet
157
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
158 158
 	fi
159
-	echo "$ZERONET_URL/$ZERONET_BLOG_ADDRESS" > /home/$MY_USERNAME/.config/zeronet/myblog
159
+	echo "$ZERONET_URL/$ZERONET_BLOG_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myblog
160 160
 
161
-	sed -i "s|ZeroNet Blog address.*|ZeroNet Blog address: $ZERONET_BLOG_ADDRESS|g" /home/$MY_USERNAME/README
162
-	sed -i "s|ZeroNet Blog private key.*|ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY|g" /home/$MY_USERNAME/README
161
+	sed -i "s|ZeroNet Blog address.*|ZeroNet Blog address: $ZERONET_BLOG_ADDRESS|g" /home/${MY_USERNAME}/README
162
+	sed -i "s|ZeroNet Blog private key.*|ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
163 163
 
164 164
 	echo $'Update of ZeroNet Blog completed' >> $INSTALL_LOG
165 165
 }
@@ -226,14 +226,14 @@ function configure_zeronet_mail {
226 226
 	echo '</service-group>' >> /tmp/zeronet-mail.service
227 227
 	cp /tmp/zeronet-mail.service /etc/avahi/services/zeronet-mail.service
228 228
 
229
-	if [ ! -d /home/$MY_USERNAME/.config/zeronet ]; then
230
-		mkdir -p /home/$MY_USERNAME/.config/zeronet
231
-		chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
229
+	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
230
+		mkdir -p /home/${MY_USERNAME}/.config/zeronet
231
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
232 232
 	fi
233
-	echo "$ZERONET_URL/$ZERONET_MAIL_ADDRESS" > /home/$MY_USERNAME/.config/zeronet/mymail
233
+	echo "$ZERONET_URL/$ZERONET_MAIL_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/mymail
234 234
 
235
-	sed -i "s|ZeroNet Mail address.*|ZeroNet Mail address: $ZERONET_MAIL_ADDRESS|g" /home/$MY_USERNAME/README
236
-	sed -i "s|ZeroNet Mail private key.*|ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY|g" /home/$MY_USERNAME/README
235
+	sed -i "s|ZeroNet Mail address.*|ZeroNet Mail address: $ZERONET_MAIL_ADDRESS|g" /home/${MY_USERNAME}/README
236
+	sed -i "s|ZeroNet Mail private key.*|ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
237 237
 
238 238
 	echo $'Update of ZeroNet Mail completed' >> $INSTALL_LOG
239 239
 }
@@ -295,14 +295,14 @@ function configure_zeronet_forum {
295 295
 	echo '</service-group>' >> /tmp/zeronet-forum.service
296 296
 	sudo cp /tmp/zeronet-forum.service /etc/avahi/services/zeronet-forum.service
297 297
 
298
-	if [ ! -d /home/$MY_USERNAME/.config/zeronet ]; then
299
-		mkdir -p /home/$MY_USERNAME/.config/zeronet
300
-		chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
298
+	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
299
+		mkdir -p /home/${MY_USERNAME}/.config/zeronet
300
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
301 301
 	fi
302
-	echo "$ZERONET_URL/$ZERONET_FORUM_ADDRESS" > /home/$MY_USERNAME/.config/zeronet/myforum
302
+	echo "$ZERONET_URL/$ZERONET_FORUM_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myforum
303 303
 
304
-	sed -i "s|ZeroNet Forum address.*|ZeroNet Forum address: $ZERONET_FORUM_ADDRESS|g" /home/$MY_USERNAME/README
305
-	sed -i "s|ZeroNet Forum private key.*|ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY|g" /home/$MY_USERNAME/README
304
+	sed -i "s|ZeroNet Forum address.*|ZeroNet Forum address: $ZERONET_FORUM_ADDRESS|g" /home/${MY_USERNAME}/README
305
+	sed -i "s|ZeroNet Forum private key.*|ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
306 306
 
307 307
 	echo $'Update of ZeroNet Forum completed' >> $INSTALL_LOG
308 308
 }
@@ -360,14 +360,14 @@ function configure_zeronet_id {
360 360
 	echo '</service-group>' >> /tmp/zeronet-id.service
361 361
 	sudo cp /tmp/zeronet-id.service /etc/avahi/services/zeronet-id.service
362 362
 
363
-	if [ ! -d /home/$MY_USERNAME/.config/zeronet ]; then
364
-		mkdir -p /home/$MY_USERNAME/.config/zeronet
365
-		chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
363
+	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
364
+		mkdir -p /home/${MY_USERNAME}/.config/zeronet
365
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
366 366
 	fi
367
-	echo "$ZERONET_URL/$ZERONET_ID_ADDRESS" > /home/$MY_USERNAME/.config/zeronet/myzeroid
367
+	echo "$ZERONET_URL/$ZERONET_ID_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myzeroid
368 368
 
369
-	sed -i "s|ZeroID address.*|ZeroID address: $ZERONET_ID_ADDRESS|g" /home/$MY_USERNAME/README
370
-	sed -i "s|ZeroID private key.*|ZeroID private key: $ZERONET_ID_PRIVATE_KEY|g" /home/$MY_USERNAME/README
369
+	sed -i "s|ZeroID address.*|ZeroID address: $ZERONET_ID_ADDRESS|g" /home/${MY_USERNAME}/README
370
+	sed -i "s|ZeroID private key.*|ZeroID private key: $ZERONET_ID_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
371 371
 
372 372
 	echo $'Update of ZeroID completed' >> $INSTALL_LOG
373 373
 }
@@ -399,8 +399,8 @@ function configure_toxcore {
399 399
 	echo $'Configured toxcore' >> $INSTALL_LOG
400 400
 
401 401
 	echo $'Clearing toxic client settings' >> $INSTALL_LOG
402
-	if [ -d /home/$MY_USERNAME/.config/tox ]; then
403
-		rm -rf /home/$MY_USERNAME/.config/tox
402
+	if [ -d /home/${MY_USERNAME}/.config/tox ]; then
403
+		rm -rf /home/${MY_USERNAME}/.config/tox
404 404
 	fi
405 405
 	echo $'toxic client configured' >> $INSTALL_LOG
406 406
 }