Procházet zdrojové kódy

Separate custom logo function for pleroma

Bob Mottram před 7 roky
rodič
revize
4737a503a7
2 změnil soubory, kde provedl 29 přidání a 16 odebrání
  1. 2
    0
      src/freedombone-app-pleroma
  2. 27
    16
      src/freedombone-utils-gnusocialtools

+ 2
- 0
src/freedombone-app-pleroma Zobrazit soubor

@@ -766,6 +766,8 @@ function upgrade_pleroma {
766 766
     sudo -u pleroma mix deps.clean --build mime
767 767
     sudo -u pleroma mix ecto.migrate
768 768
 
769
+    #pleroma_custom_logo "$PLEROMA_DIR"
770
+
769 771
     expire_pleroma_posts "$PLEROMA_DOMAIN_NAME" "$PLEROMA_EXPIRE_MONTHS"
770 772
     create_pleroma_blocklist
771 773
 

+ 27
- 16
src/freedombone-utils-gnusocialtools Zobrazit soubor

@@ -95,6 +95,32 @@ function qvitter_update_background {
95 95
     fi
96 96
 }
97 97
 
98
+function pleroma_custom_logo {
99
+    basedir="$1"
100
+    if [ "$2" ]; then
101
+        if [[ "$2" == *".png" ]]; then
102
+            cp "$2" "$basedir/priv/static/static/logo.png"
103
+            return
104
+        fi
105
+    fi
106
+
107
+    if [ -f "$basedir/static/logo.png" ]; then
108
+        if [ -f "$HOME/${PROJECT_NAME}/img/logo_fbone3.png" ]; then
109
+            cp "$HOME/${PROJECT_NAME}/img/logo_fbone3.png" "$basedir/static/logo.png"
110
+            if [ -d "$basedir/priv/static/static" ]; then
111
+                cp "$HOME/${PROJECT_NAME}/img/logo_fbone3.png" "$basedir/priv/static/static/logo.png"
112
+            fi
113
+        else
114
+            if [ -f "/home/$MY_USERNAME/${PROJECT_NAME}/img/logo_fbone3.png" ]; then
115
+                cp "/home/$MY_USERNAME/${PROJECT_NAME}/img/logo_fbone3.png" "$basedir/static/logo.png"
116
+                if [ -d "$basedir/priv/static/static" ]; then
117
+                    cp "/home/$MY_USERNAME/${PROJECT_NAME}/img/logo_fbone3.png" "$basedir/priv/static/static/logo.png"
118
+                fi
119
+            fi
120
+        fi
121
+    fi
122
+}
123
+
98 124
 function pleroma_set_background_image_from_url {
99 125
     basedir="$1"
100 126
     domain_name="$2"
@@ -157,22 +183,7 @@ function pleroma_set_background_image_from_url {
157 183
         return
158 184
     fi
159 185
 
160
-    # customise the logo
161
-    if [ -f "$basedir/static/logo.png" ]; then
162
-        if [ -f "$HOME/${PROJECT_NAME}/img/logo_fbone3.png" ]; then
163
-            cp "$HOME/${PROJECT_NAME}/img/logo_fbone3.png" "$basedir/static/logo.png"
164
-            if [ -d "$basedir/priv/static/static" ]; then
165
-                cp "$HOME/${PROJECT_NAME}/img/logo_fbone3.png" "$basedir/priv/static/static/logo.png"
166
-            fi
167
-        else
168
-            if [ -f "/home/$MY_USERNAME/${PROJECT_NAME}/img/logo_fbone3.png" ]; then
169
-                cp "/home/$MY_USERNAME/${PROJECT_NAME}/img/logo_fbone3.png" "$basedir/static/logo.png"
170
-                if [ -d "$basedir/priv/static/static" ]; then
171
-                    cp "/home/$MY_USERNAME/${PROJECT_NAME}/img/logo_fbone3.png" "$basedir/priv/static/static/logo.png"
172
-                fi
173
-            fi
174
-        fi
175
-    fi
186
+    pleroma_custom_logo "$basedir"
176 187
 
177 188
     # customise the title
178 189
     if [ -f "$basedir/static/config.json" ]; then