|
@@ -202,8 +202,8 @@ MICROBLOG_THEME_REPO="https://git.gnu.io/h2p/Qvitter.git"
|
202
|
202
|
MICROBLOG_THEME_COMMIT='2816507545bb7e3da5b0a290692576b8d2ee335f'
|
203
|
203
|
MICROBLOG_WELCOME_MESSAGE=$'<h1>Welcome to GNU Social – a federated microblog</h1><p>Another Freedombone site</p>'
|
204
|
204
|
MICROBLOG_BACKGROUND_IMAGE_URL=
|
205
|
|
-MICROBLOG_MARKDOWN_REPO="https://github.com/bashrc/gs-markdown"
|
206
|
|
-MICROBLOG_MARKDOWN_COMMIT='9de4bf9250fe3ebd7b159ca587cf39f828f7bf4c'
|
|
205
|
+MICROBLOG_MARKDOWN_REPO="https://git.gnu.io/chimo/markdown.git"
|
|
206
|
+MICROBLOG_MARKDOWN_COMMIT='03c53942f94b3376f0946e6e1fe566cc21ccf232'
|
207
|
207
|
|
208
|
208
|
# Domain name for hubzilla installation
|
209
|
209
|
HUBZILLA_DOMAIN_NAME=
|
|
@@ -9208,23 +9208,29 @@ function install_gnu_social_markdown {
|
9208
|
9208
|
return
|
9209
|
9209
|
fi
|
9210
|
9210
|
|
|
9211
|
+ MICROBLOG_PATH=/var/www/$MICROBLOG_DOMAIN_NAME/htdocs
|
|
9212
|
+
|
9211
|
9213
|
# update to the next commit
|
9212
|
|
- set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins/Markdown "GNU Social Markdown commit" "$MICROBLOG_MARKDOWN_COMMIT" $MICROBLOG_MARKDOWN_REPO
|
|
9214
|
+ set_repo_commit $MICROBLOG_PATH/local/plugins/Markdown "GNU Social Markdown commit" "$MICROBLOG_MARKDOWN_COMMIT" $MICROBLOG_MARKDOWN_REPO
|
9213
|
9215
|
|
9214
|
9216
|
if grep -Fxq "install_gnu_social_markdown" $COMPLETION_FILE; then
|
9215
|
9217
|
return
|
9216
|
9218
|
fi
|
9217
|
9219
|
|
9218
|
|
- if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins ]; then
|
9219
|
|
- mkdir -p /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins
|
|
9220
|
+ if [ -d $MICROBLOG_PATH/local/plugins/Markdown ]; then
|
|
9221
|
+ rm -rf $MICROBLOG_PATH/local/plugins/Markdown
|
9220
|
9222
|
fi
|
9221
|
9223
|
|
9222
|
|
- cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins
|
|
9224
|
+ if [ ! -d $MICROBLOG_PATH/local/plugins ]; then
|
|
9225
|
+ mkdir -p $MICROBLOG_PATH/local/plugins
|
|
9226
|
+ fi
|
|
9227
|
+
|
|
9228
|
+ cd $MICROBLOG_PATH/local/plugins
|
9223
|
9229
|
git_clone $MICROBLOG_MARKDOWN_REPO Markdown
|
9224
|
|
- cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins/Markdown
|
|
9230
|
+ cd $MICROBLOG_PATH/local/plugins/Markdown
|
9225
|
9231
|
git checkout $MICROBLOG_MARKDOWN_COMMIT -b $MICROBLOG_MARKDOWN_COMMIT
|
9226
|
9232
|
|
9227
|
|
- microblog_config_file=/var/www/$MICROBLOG_DOMAIN_NAME/htdocs/config.php
|
|
9233
|
+ microblog_config_file=$MICROBLOG_PATH/config.php
|
9228
|
9234
|
if ! grep -q "addPlugin('Markdown'" $microblog_config_file; then
|
9229
|
9235
|
echo "" >> $microblog_config_file
|
9230
|
9236
|
echo "// Markdown settings" >> $microblog_config_file
|
|
@@ -9235,7 +9241,7 @@ function install_gnu_social_markdown {
|
9235
|
9241
|
echo "GNU Social Markdown commit:$MICROBLOG_MARKDOWN_COMMIT" >> $COMPLETION_FILE
|
9236
|
9242
|
fi
|
9237
|
9243
|
|
9238
|
|
- chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
|
|
9244
|
+ chown -R www-data:www-data $MICROBLOG_PATH
|
9239
|
9245
|
|
9240
|
9246
|
echo 'install_gnu_social_markdown' >> $COMPLETION_FILE
|
9241
|
9247
|
}
|