Browse Source

Fix gnusocial

Bob Mottram 9 years ago
parent
commit
f7a25184dc
1 changed files with 2 additions and 8 deletions
  1. 2
    8
      src/freedombone

+ 2
- 8
src/freedombone View File

@@ -8130,13 +8130,10 @@ function install_gnu_social {
8130 8130
         mkdir /var/www/$MICROBLOG_DOMAIN_NAME
8131 8131
     fi
8132 8132
     if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs ]; then
8133
-        mkdir /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8133
+        git clone $MICROBLOG_REPO /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8134 8134
     fi
8135 8135
 
8136
-    cd $INSTALL_DIR
8137
-    git clone $MICROBLOG_REPO gnusocial
8138
-
8139
-    cd gnusocial
8136
+    cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8140 8137
     git checkout $GNUSOCIAL_COMMIT -b $GNUSOCIAL_COMMIT
8141 8138
     if ! grep -q "GNU Social commit" $COMPLETION_FILE; then
8142 8139
         echo "GNU Social commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
@@ -8144,9 +8141,6 @@ function install_gnu_social {
8144 8141
         sed -i "s/GNU Social commit.*/GNU Social commit:$GNUSOCIAL_COMMIT/g" $COMPLETION_FILE
8145 8142
     fi
8146 8143
 
8147
-    cd $INSTALL_DIR
8148
-    rm -rf /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8149
-    mv gnusocial /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8150 8144
     chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8151 8145
     chown www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8152 8146
     chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/avatar