|
@@ -63,10 +63,10 @@ function reconfigure_zeronet {
|
63
|
63
|
|
64
|
64
|
function upgrade_zeronet {
|
65
|
65
|
function_check set_repo_commit
|
66
|
|
- set_repo_commit $MESH_INSTALL_DIR/zeronet "ZeroNet commit" "$ZERONET_COMMIT" $ZERONET_REPO
|
67
|
|
- set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroBlog "ZeroNet Blog commit" "$ZERONET_BLOG_COMMIT" $ZERONET_BLOG_REPO
|
68
|
|
- set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroMail "ZeroNet Mail commit" "$ZERONET_MAIL_COMMIT" $ZERONET_MAIL_REPO
|
69
|
|
- set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroTalk "ZeroNet Forum commit" "$ZERONET_FORUM_COMMIT" $ZERONET_FORUM_REPO
|
|
66
|
+ set_repo_commit $MESH_INSTALL_DIR/zeronet "zeroNet commit" "$ZERONET_COMMIT" $ZERONET_REPO
|
|
67
|
+ set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroBlog "zeroNet blog commit" "$ZERONET_BLOG_COMMIT" $ZERONET_BLOG_REPO
|
|
68
|
+ set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroMail "zeroNet mail commit" "$ZERONET_MAIL_COMMIT" $ZERONET_MAIL_REPO
|
|
69
|
+ set_repo_commit $MESH_INSTALL_DIR/zeronet/ZeroTalk "zeroNet forum commit" "$ZERONET_FORUM_COMMIT" $ZERONET_FORUM_REPO
|
70
|
70
|
}
|
71
|
71
|
|
72
|
72
|
function backup_local_zeronet {
|
|
@@ -104,7 +104,7 @@ function remove_zeronet_mail {
|
104
|
104
|
rm -rf $MESH_INSTALL_DIR/zeronet/ZeroMail
|
105
|
105
|
fi
|
106
|
106
|
sed -i '/install_zeronet_mail/d' $COMPLETION_FILE
|
107
|
|
- sed -i '/ZeroNet Mail/d' $COMPLETION_FILE
|
|
107
|
+ sed -i '/zeroNet /d' $COMPLETION_FILE
|
108
|
108
|
}
|
109
|
109
|
|
110
|
110
|
function remove_zeronet_forum {
|
|
@@ -258,7 +258,6 @@ function install_zeronet_blog {
|
258
|
258
|
|
259
|
259
|
function install_zeronet_mail {
|
260
|
260
|
if [[ $(app_is_installed zeronet_mail) == "1" ]]; then
|
261
|
|
- if grep -Fxq "install_zeronet_mail" $COMPLETION_FILE; then
|
262
|
261
|
return
|
263
|
262
|
fi
|
264
|
263
|
|