Explorar el Código

Better extension detection

Bob Mottram hace 9 años
padre
commit
d12114c22b
Se han modificado 1 ficheros con 21 adiciones y 8 borrados
  1. 21
    8
      src/freedombone

+ 21
- 8
src/freedombone Ver fichero

@@ -8634,13 +8634,24 @@ function install_gnu_social_theme {
8634 8634
     git checkout $MICROBLOG_THEME_COMMIT -b $MICROBLOG_THEME_COMMIT
8635 8635
 
8636 8636
     # download a custom background image
8637
+    MICROBLOG_BACKGROUND_IMAGE_URL_EXT=
8637 8638
     if [ $MICROBLOG_BACKGROUND_IMAGE_URL ]; then
8638
-        MICROBLOG_BACKGROUND_IMAGE_URL_EXT=$(echo $MICROBLOG_BACKGROUND_IMAGE_URL | awk -F '.' '{print $2}')
8639
-        wget $MICROBLOG_BACKGROUND_IMAGE_URL -O img/custom.${MICROBLOG_BACKGROUND_IMAGE_URL_EXT}
8640
-        if [ ! -f img/custom.${MICROBLOG_BACKGROUND_IMAGE_URL_EXT} ]; then
8641
-            echo "$MICROBLOG_BACKGROUND_IMAGE_URL"
8642
-            echo $'Custom background image for microblog could not be downloaded'
8643
-            exit 87524
8639
+        if [[ $$MICROBLOG_BACKGROUND_IMAGE_URL == *".jpeg" || $$MICROBLOG_BACKGROUND_IMAGE_URL == *".jpg" ]]; then
8640
+            MICROBLOG_BACKGROUND_IMAGE_URL_EXT="jpg"
8641
+        fi
8642
+        if [[ $$MICROBLOG_BACKGROUND_IMAGE_URL == *".png" ]]; then
8643
+            MICROBLOG_BACKGROUND_IMAGE_URL_EXT="png"
8644
+        fi
8645
+        if [[ $$MICROBLOG_BACKGROUND_IMAGE_URL == *".gif" ]]; then
8646
+            MICROBLOG_BACKGROUND_IMAGE_URL_EXT="gif"
8647
+        fi
8648
+        if [ $MICROBLOG_BACKGROUND_IMAGE_URL_EXT ]; then
8649
+            wget $MICROBLOG_BACKGROUND_IMAGE_URL -O img/custom.${MICROBLOG_BACKGROUND_IMAGE_URL_EXT}
8650
+            if [ ! -f img/custom.${MICROBLOG_BACKGROUND_IMAGE_URL_EXT} ]; then
8651
+                echo "$MICROBLOG_BACKGROUND_IMAGE_URL"
8652
+                echo $'Custom background image for microblog could not be downloaded'
8653
+                exit 87524
8654
+            fi
8644 8655
         fi
8645 8656
     fi
8646 8657
 
@@ -8670,8 +8681,10 @@ function install_gnu_social_theme {
8670 8681
         echo "\$config['site']['qvitter']['customwelcometext']['es'] = '$MICROBLOG_WELCOME_MESSAGE';" >> $microblog_config_file
8671 8682
         echo "\$config['site']['qvitter']['blocked_ips'] = array();" >> $microblog_config_file
8672 8683
     else
8673
-        if [ -f img/custom.${MICROBLOG_BACKGROUND_IMAGE_URL_EXT} ]; then
8674
-            sed -i "s|\$config['site']['qvitter']['sitebackground'].*|\$config['site']['qvitter']['sitebackground'] = 'img/custom.${MICROBLOG_BACKGROUND_IMAGE_URL_EXT}';|g" $microblog_config_file
8684
+        if [ $MICROBLOG_BACKGROUND_IMAGE_URL_EXT ]; then
8685
+            if [ -f img/custom.${MICROBLOG_BACKGROUND_IMAGE_URL_EXT} ]; then
8686
+                sed -i "s|\$config['site']['qvitter']['sitebackground'].*|\$config['site']['qvitter']['sitebackground'] = 'img/custom.${MICROBLOG_BACKGROUND_IMAGE_URL_EXT}';|g" $microblog_config_file
8687
+            fi
8675 8688
         fi
8676 8689
     fi
8677 8690