浏览代码

Also change pleroma background image in a separate static subdirectory

Bob Mottram 7 年前
父节点
当前提交
aa5feabc51
共有 2 个文件被更改,包括 15 次插入0 次删除
  1. 1
    0
      src/freedombone-app-pleroma
  2. 14
    0
      src/freedombone-utils-gnusocialtools

+ 1
- 0
src/freedombone-app-pleroma 查看文件

@@ -309,6 +309,7 @@ function pleroma_set_title {
309 309
                 PLEROMA_DOMAIN_NAME=$(get_completion_param "pleroma domain")
310 310
                 write_config_param "PLEROMA_TITLE" "$PLEROMA_TITLE"
311 311
                 sed -i "s|\"name\":.*|\"name\": \"${PLEROMA_TITLE}\",|g" $PLEROMA_DIR/static/config.json
312
+                sed -i "s|\"name\":.*|\"name\": \"${PLEROMA_TITLE}\",|g" $PLEROMA_DIR/priv/static/static/config.json
312 313
                 sed -i "s|name: .*|name: \"${PLEROMA_TITLE}\",|g" $PLEROMA_DIR/config/config.exs
313 314
                 systemctl restart pleroma
314 315
                 dialog --title $"Set Pleroma title" \

+ 14
- 0
src/freedombone-utils-gnusocialtools 查看文件

@@ -133,6 +133,11 @@ function pleroma_set_background_image_from_url {
133 133
             chown www-data:www-data static/bg_custom.${ext}
134 134
             sed -i "s|\"background\":.*|\"background\": \"/static/bg_custom.${ext}\",|g" static/config.json
135 135
         fi
136
+        if [ -d priv/static/static ]; then
137
+            cp bg_custom.${ext} priv/static/static/bg_custom.${ext}
138
+            chown www-data:www-data priv/static/static/bg_custom.${ext}
139
+            sed -i "s|\"background\":.*|\"background\": \"/static/bg_custom.${ext}\",|g" priv/static/static/config.json
140
+        fi
136 141
 
137 142
         if [[ "$basedir" != $PLEROMA_DIR ]]; then
138 143
             qvitter_update_background ${domain_name} ${ext}
@@ -148,9 +153,15 @@ function pleroma_set_background_image_from_url {
148 153
     if [ -f $basedir/static/logo.png ]; then
149 154
         if [ -f ~/freedombone/img/logo_fbone3.png ]; then
150 155
             cp ~/freedombone/img/logo_fbone3.png $basedir/static/logo.png
156
+            if [ -d $basedir/priv/static/static ]; then
157
+                cp ~/freedombone/img/logo_fbone3.png $basedir/priv/static/static/logo.png
158
+            fi
151 159
         else
152 160
             if [ -f /home/$MY_USERNAME/freedombone/img/logo_fbone3.png ]; then
153 161
                 cp /home/$MY_USERNAME/freedombone/img/logo_fbone3.png $basedir/static/logo.png
162
+                if [ -d $basedir/priv/static/static ]; then
163
+                    cp /home/$MY_USERNAME/freedombone/img/logo_fbone3.png $basedir/priv/static/static/logo.png
164
+                fi
154 165
             fi
155 166
         fi
156 167
     fi
@@ -159,6 +170,9 @@ function pleroma_set_background_image_from_url {
159 170
     if [ -f $basedir/static/config.json ]; then
160 171
         sed -i "s|\"name\":.*|\"name\": \"${title}\",|g" $basedir/static/config.json
161 172
     fi
173
+    if [ -f $basedir/priv/static/static/config.json ]; then
174
+        sed -i "s|\"name\":.*|\"name\": \"${title}\",|g" $basedir/priv/static/static/config.json
175
+    fi
162 176
 
163 177
     echo "0"
164 178
 }