Quellcode durchsuchen

Tidy gnusocial app

Bob Mottram vor 8 Jahren
Ursprung
Commit
62beb7db77
1 geänderte Dateien mit 30 neuen und 4 gelöschten Zeilen
  1. 30
    4
      src/freedombone-app-gnusocial

+ 30
- 4
src/freedombone-app-gnusocial Datei anzeigen

53
 GNUSOCIAL_NSFW_REPO="https://gitgud.io/ShitposterClub/SensitiveContent"
53
 GNUSOCIAL_NSFW_REPO="https://gitgud.io/ShitposterClub/SensitiveContent"
54
 GNUSOCIAL_NSFW_COMMIT='a096bbe0cfae9a9b177682920ffb58d32a48e136'
54
 GNUSOCIAL_NSFW_COMMIT='a096bbe0cfae9a9b177682920ffb58d32a48e136'
55
 
55
 
56
+# script which causes old posts to expire
57
+gnusocial_expire_script=/usr/bin/gnusocial-expire
58
+
56
 function install_interactive_gnusocial {
59
 function install_interactive_gnusocial {
57
     if [ ! $ONION_ONLY ]; then
60
     if [ ! $ONION_ONLY ]; then
58
         ONION_ONLY='no'
61
         ONION_ONLY='no'
360
     remove_onion_service microblog ${MICROBLOG_ONION_PORT}
363
     remove_onion_service microblog ${MICROBLOG_ONION_PORT}
361
     sed -i '/install_gnusocial/d' $COMPLETION_FILE
364
     sed -i '/install_gnusocial/d' $COMPLETION_FILE
362
     sed -i '/GNU Social /d' $COMPLETION_FILE
365
     sed -i '/GNU Social /d' $COMPLETION_FILE
366
+    if grep -q "$gnusocial_expire_script" /etc/crontab; then
367
+        sed -i "/$gnusocial_expire_script/d" /etc/crontab
368
+    fi
363
     remove_app gnusocial
369
     remove_app gnusocial
364
 }
370
 }
365
 
371
 
615
         echo $"Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
621
         echo $"Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
616
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
622
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
617
         chmod 600 /home/$MY_USERNAME/README
623
         chmod 600 /home/$MY_USERNAME/README
624
+    else
625
+        if [ -f /home/$MY_USERNAME/README ]; then
626
+            sed -i "s|Microblog administrator password.*|Microblog administrator password: $MICROBLOG_ADMIN_PASSWORD|g" /home/$MY_USERNAME/README
627
+        fi
618
     fi
628
     fi
619
 
629
 
620
     if ! grep -q "Microblog onion domain" /home/$MY_USERNAME/README; then
630
     if ! grep -q "Microblog onion domain" /home/$MY_USERNAME/README; then
622
         echo '' >> /home/$MY_USERNAME/README
632
         echo '' >> /home/$MY_USERNAME/README
623
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
633
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
624
         chmod 600 /home/$MY_USERNAME/README
634
         chmod 600 /home/$MY_USERNAME/README
635
+    else
636
+        if [ -f /home/$MY_USERNAME/README ]; then
637
+            sed -i "s|Microblog onion domain.*|Microblog onion domain: ${MICROBLOG_ONION_HOSTNAME}|g" /home/$MY_USERNAME/README
638
+        fi
639
+    fi
640
+
641
+    if ! grep -q "GNU Social onion domain" $COMPLETION_FILE; then
642
+        echo "GNU Social onion domain:${MICROBLOG_ONION_HOSTNAME}" >> $COMPLETION_FILE
643
+    else
644
+        sed -i "s|GNU Social onion domain.*|GNU Social onion domain:${MICROBLOG_ONION_HOSTNAME}|g" $COMPLETION_FILE
645
+    fi
646
+
647
+    if ! grep -q "GNU Social domain" $COMPLETION_FILE; then
648
+        echo "GNU Social domain:$MICROBLOG_DOMAIN_NAME" >> $COMPLETION_FILE
649
+    else
650
+        sed -i "s|GNU Social domain.*|GNU Social domain:$MICROBLOG_DOMAIN_NAME|g" $COMPLETION_FILE
625
     fi
651
     fi
626
-    echo "GNU Social onion domain:${MICROBLOG_ONION_HOSTNAME}" >> $COMPLETION_FILE
627
 
652
 
628
-    echo "GNU Social domain:$MICROBLOG_DOMAIN_NAME" >> $COMPLETION_FILE
629
     install_completed gnusocial_main
653
     install_completed gnusocial_main
630
 }
654
 }
631
 
655
 
754
         return
778
         return
755
     fi
779
     fi
756
 
780
 
757
-    gnusocial_expire_script=/usr/bin/gnusocial-expire
758
-
759
     echo '<?php' > $gnusocial_expire_script
781
     echo '<?php' > $gnusocial_expire_script
760
     echo '' >> $gnusocial_expire_script
782
     echo '' >> $gnusocial_expire_script
761
     echo '// GNU Social post expiry script, based on StatExpire by Tony Baldwin' >> $gnusocial_expire_script
783
     echo '// GNU Social post expiry script, based on StatExpire by Tony Baldwin' >> $gnusocial_expire_script
894
 
916
 
895
     if ! grep -q "GNU Social theme commit" $COMPLETION_FILE; then
917
     if ! grep -q "GNU Social theme commit" $COMPLETION_FILE; then
896
         echo "GNU Social theme commit:$MICROBLOG_THEME_COMMIT" >> $COMPLETION_FILE
918
         echo "GNU Social theme commit:$MICROBLOG_THEME_COMMIT" >> $COMPLETION_FILE
919
+    else
920
+        sed -i "s|GNU Social theme commit.*|GNU Social theme commit:$MICROBLOG_THEME_COMMIT|g" $COMPLETION_FILE
897
     fi
921
     fi
898
 
922
 
899
     chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
923
     chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
935
 
959
 
936
     if ! grep -q "GNU Social Markdown commit" $COMPLETION_FILE; then
960
     if ! grep -q "GNU Social Markdown commit" $COMPLETION_FILE; then
937
         echo "GNU Social Markdown commit:$MICROBLOG_MARKDOWN_COMMIT" >> $COMPLETION_FILE
961
         echo "GNU Social Markdown commit:$MICROBLOG_MARKDOWN_COMMIT" >> $COMPLETION_FILE
962
+    else
963
+        sed -i "s|GNU Social Markdown commit.*|GNU Social Markdown commit:$MICROBLOG_MARKDOWN_COMMIT|g" $COMPLETION_FILE
938
     fi
964
     fi
939
 
965
 
940
     chown -R www-data:www-data $MICROBLOG_PATH
966
     chown -R www-data:www-data $MICROBLOG_PATH