Просмотр исходного кода

Use wildcard deletes so that thumbnails are included

Bob Mottram 7 лет назад
Родитель
Сommit
15167e3483
1 измененных файлов: 4 добавлений и 4 удалений
  1. 4
    4
      src/freedombone-utils-gnusocialtools

+ 4
- 4
src/freedombone-utils-gnusocialtools Просмотреть файл

@@ -421,8 +421,8 @@ function gnusocial_block_user_script {
421 421
     echo '          for f in $files_to_delete' >> /usr/bin/gnusocial-delete-user
422 422
     echo '          do' >> /usr/bin/gnusocial-delete-user
423 423
     echo '              if [ $filectr -gt 0 ]; then' >> /usr/bin/gnusocial-delete-user
424
-    echo '                  if [ -f /var/www/${domain_name}/htdocs/file/${f} ]; then' >> /usr/bin/gnusocial-delete-user
425
-    echo '                      rm /var/www/${domain_name}/htdocs/file/${f}' >> /usr/bin/gnusocial-delete-user
424
+    echo '                  if $(ls /var/www/${domain_name}/htdocs/file/*${f}* 1> /dev/null 2>&1); then' >> /usr/bin/gnusocial-delete-user
425
+    echo '                      rm /var/www/${domain_name}/htdocs/file/*${f}*' >> /usr/bin/gnusocial-delete-user
426 426
     echo '                  fi' >> /usr/bin/gnusocial-delete-user
427 427
     echo '              fi' >> /usr/bin/gnusocial-delete-user
428 428
     echo '              filectr=$((filectr + 1))' >> /usr/bin/gnusocial-delete-user
@@ -504,8 +504,8 @@ function gnusocial_block_domain_script {
504 504
     echo '            for f in $files_to_delete' >> /usr/bin/gnusocial-delete-domain
505 505
     echo '            do' >> /usr/bin/gnusocial-delete-domain
506 506
     echo '                if [ $filectr -gt 0 ]; then' >> /usr/bin/gnusocial-delete-domain
507
-    echo '                    if [ -f /var/www/${domain_name}/htdocs/file/${f} ]; then' >> /usr/bin/gnusocial-delete-domain
508
-    echo '                        rm /var/www/${domain_name}/htdocs/file/${f}' >> /usr/bin/gnusocial-delete-domain
507
+    echo '                    if $(ls /var/www/${domain_name}/htdocs/file/*${f}* 1> /dev/null 2>&1); then' >> /usr/bin/gnusocial-delete-domain
508
+    echo '                        rm /var/www/${domain_name}/htdocs/file/*${f}*' >> /usr/bin/gnusocial-delete-domain
509 509
     echo '                    fi' >> /usr/bin/gnusocial-delete-domain
510 510
     echo '                fi' >> /usr/bin/gnusocial-delete-domain
511 511
     echo '                filectr=$((filectr + 1))' >> /usr/bin/gnusocial-delete-domain