Ver código fonte

Add mobile version of tt-rss reader

Bob Mottram 9 anos atrás
pai
commit
7bd57296d3
1 arquivos alterados com 65 adições e 1 exclusões
  1. 65
    1
      src/freedombone

+ 65
- 1
src/freedombone Ver arquivo

@@ -498,6 +498,8 @@ RSS_READER_COMMIT='50bda3fefbff31e5a5503d6fd1a927412fe29026'
498 498
 RSS_READER_ADMIN_PASSWORD=
499 499
 RSS_READER_ONION_PORT=8092
500 500
 RSS_READER_DOMAIN_NAME=ttrss
501
+RSS_MOBILE_READER_REPO="https://github.com/mboinet/ttrss-mobile"
502
+RSS_MOBILE_READER_COMMIT='d5242e1c269e9480ab3b66b7a38da3c892dfb326'
501 503
 
502 504
 function show_help {
503 505
     echo ''
@@ -1033,9 +1035,15 @@ function read_configuration {
1033 1035
         if grep -q "RSS_READER_REPO" $CONFIGURATION_FILE; then
1034 1036
             RSS_READER_REPO=$(grep "RSS_READER_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1035 1037
         fi
1038
+        if grep -q "RSS_MOBILE_READER_REPO" $CONFIGURATION_FILE; then
1039
+            RSS_MOBILE_READER_REPO=$(grep "RSS_MOBILE_READER_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1040
+        fi
1036 1041
         if grep -q "RSS_READER_COMMIT" $CONFIGURATION_FILE; then
1037 1042
             RSS_READER_COMMIT=$(grep "RSS_READER_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1038 1043
         fi
1044
+        if grep -q "RSS_MOBILE_READER_COMMIT" $CONFIGURATION_FILE; then
1045
+            RSS_MOBILE_READER_COMMIT=$(grep "RSS_MOBILE_READER_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1046
+        fi
1039 1047
         if grep -q "RSS_READER_ADMIN_PASSWORD" $CONFIGURATION_FILE; then
1040 1048
             RSS_READER_ADMIN_PASSWORD=$(grep "RSS_READER_ADMIN_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1041 1049
         fi
@@ -8433,6 +8441,7 @@ function install_rss_reader {
8433 8441
         echo $'  Host name: localhost' >> /home/$MY_USERNAME/README
8434 8442
         echo $'  Port: 3306' >> /home/$MY_USERNAME/README
8435 8443
         echo $"  Tiny Tint RSS URL: http://${RSS_READER_ONION_HOSTNAME}/" >> /home/$MY_USERNAME/README
8444
+        echo $"  Tiny Tint RSS URL (mobile): http://${RSS_READER_ONION_HOSTNAME}/mobile" >> /home/$MY_USERNAME/README
8436 8445
         echo '' >> /home/$MY_USERNAME/README
8437 8446
         echo $'Click "Test Configuration" and then "Initialize database"' >> /home/$MY_USERNAME/README
8438 8447
         echo $'You may need to click "save configuration"' >> /home/$MY_USERNAME/README
@@ -8440,7 +8449,6 @@ function install_rss_reader {
8440 8449
         echo $'Then go to Preferences/Users, click on the "admin" user and then change the password.' >> /home/$MY_USERNAME/README
8441 8450
         echo $'You will immediately see what looks like an authorisation error, so log out and log back' >> /home/$MY_USERNAME/README
8442 8451
         echo $'in with username "admin" and your new password.' >> /home/$MY_USERNAME/README
8443
-        echo '' >> /home/$MY_USERNAME/README
8444 8452
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
8445 8453
         chmod 600 /home/$MY_USERNAME/README
8446 8454
     fi
@@ -8448,6 +8456,61 @@ function install_rss_reader {
8448 8456
     echo 'install_rss_reader' >> $COMPLETION_FILE
8449 8457
 }
8450 8458
 
8459
+function install_rss_mobile_reader {
8460
+    if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
8461
+        return
8462
+    fi
8463
+
8464
+    if [ ! $RSS_READER_PATH ]; then
8465
+        RSS_READER_PATH=/etc/share/tt-rss
8466
+    fi
8467
+    RSS_MOBILE_READER_PATH=/etc/share/ttrss-mobile
8468
+
8469
+    if [ ! -d $RSS_READER_PATH ]; then
8470
+        echo $'tt-rss is not installed, so the mobile version cannot be installed'
8471
+        exit 63452
8472
+    fi
8473
+
8474
+    # update to the next commit
8475
+    if [ -d $RSS_MOBILE_READER_PATH ]; then
8476
+        if grep -q "RSS mobile reader commit" $COMPLETION_FILE; then
8477
+            CURRENT_RSS_MOBILE_READER_COMMIT=$(grep "RSS mobile reader commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
8478
+            if [[ "$CURRENT_RSS_MOBILE_READER_COMMIT" != "$RSS_MOBILE_READER_COMMIT" ]]; then
8479
+                cd $RSS_MOBILE_READER_PATH
8480
+                git_pull $RSS_MOBILE_READER_REPO $RSS_MOBILE_READER_COMMIT
8481
+                sed -i "s/RSS mobile reader commit.*/RSS mobile reader commit:$RSS_MOBILE_READER_COMMIT/g" $COMPLETION_FILE
8482
+                chown -R www-data:www-data $RSS_MOBILE_READER_PATH
8483
+            fi
8484
+        else
8485
+            echo "RSS mobile reader commit:$RSS_MOBILE_READER_COMMIT" >> $COMPLETION_FILE
8486
+        fi
8487
+    fi
8488
+
8489
+    if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then
8490
+        return
8491
+    fi
8492
+
8493
+    cd /etc/share
8494
+    git_clone $RSS_MOBILE_READER_REPO ttrss-mobile
8495
+    if [ ! -d $RSS_MOBILE_READER_PATH ]; then
8496
+        echo $'Could not clone RSS mobile reader repo'
8497
+        exit 24816
8498
+    fi
8499
+    cd $RSS_MOBILE_READER_PATH
8500
+    git checkout $RSS_MOBILE_READER_COMMIT -b $RSS_MOBILE_READER_COMMIT
8501
+    if ! grep -q "RSS mobile reader commit" $COMPLETION_FILE; then
8502
+        echo "RSS mobile reader commit:$RSS_MOBILE_READER_COMMIT" >> $COMPLETION_FILE
8503
+    fi
8504
+
8505
+    # link to the main site
8506
+    ln -s $RSS_MOBILE_READER_PATH $RSS_READER_PATH/mobile
8507
+
8508
+    chown -R www-data:www-data $RSS_MOBILE_READER_PATH
8509
+    chmod a+x $RSS_MOBILE_READER_PATH
8510
+
8511
+    echo 'install_rss_mobile_reader' >> $COMPLETION_FILE
8512
+}
8513
+
8451 8514
 function install_gnu_social {
8452 8515
     if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
8453 8516
         return
@@ -10343,6 +10406,7 @@ mark_blog_domain
10343 10406
 install_gnu_social
10344 10407
 install_gnu_social_theme
10345 10408
 install_rss_reader
10409
+install_rss_mobile_reader
10346 10410
 install_hubzilla
10347 10411
 install_dlna_server
10348 10412
 configure_firewall_for_dlna