瀏覽代碼

lower case

Bob Mottram 8 年之前
父節點
當前提交
c9435e5c8f
共有 4 個檔案被更改,包括 25 行新增23 行删除
  1. 18
    18
      src/freedombone-app-rss
  2. 4
    4
      src/freedombone-app-webmail
  3. 1
    1
      src/freedombone-controlpanel
  4. 2
    0
      src/freedombone-utils-upgrade

+ 18
- 18
src/freedombone-app-rss 查看文件

83
 function upgrade_rss {
83
 function upgrade_rss {
84
     if grep -Fxq "install_rss" $COMPLETION_FILE; then
84
     if grep -Fxq "install_rss" $COMPLETION_FILE; then
85
         function_check set_repo_commit
85
         function_check set_repo_commit
86
-        set_repo_commit $RSS_READER_PATH "RSS reader commit" "$RSS_READER_COMMIT" $RSS_READER_REPO
86
+        set_repo_commit $RSS_READER_PATH "rss reader commit" "$RSS_READER_COMMIT" $RSS_READER_REPO
87
         function_check rss_modifications
87
         function_check rss_modifications
88
         rss_modifications
88
         rss_modifications
89
     fi
89
     fi
104
         if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
104
         if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
105
             if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then
105
             if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then
106
                 sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE
106
                 sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE
107
-                sed -i '/RSS mobile reader commit/d' $COMPLETION_FILE
107
+                sed -i '/rss mobile reader commit/d' $COMPLETION_FILE
108
                 rm -rf $RSS_READER_PATH/g2ttree-mobile
108
                 rm -rf $RSS_READER_PATH/g2ttree-mobile
109
             fi
109
             fi
110
         fi
110
         fi
111
 
111
 
112
         # update to the next commit
112
         # update to the next commit
113
         function_check set_repo_commit
113
         function_check set_repo_commit
114
-        set_repo_commit $RSS_MOBILE_READER_PATH "RSS mobile reader commit" "$RSS_MOBILE_READER_COMMIT" $RSS_MOBILE_READER_REPO
114
+        set_repo_commit $RSS_MOBILE_READER_PATH "rss mobile reader commit" "$RSS_MOBILE_READER_COMMIT" $RSS_MOBILE_READER_REPO
115
     fi
115
     fi
116
 }
116
 }
117
 
117
 
118
 function backup_local_rss {
118
 function backup_local_rss {
119
     RSS_READER_DOMAIN_NAME='ttrss'
119
     RSS_READER_DOMAIN_NAME='ttrss'
120
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
121
-        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
120
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
121
+        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
122
     fi
122
     fi
123
 
123
 
124
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
124
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
125
         if [ -d /etc/share/tt-rss ]; then
125
         if [ -d /etc/share/tt-rss ]; then
126
-            RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
126
+            RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
127
 
127
 
128
             echo $"Backing up ttrss"
128
             echo $"Backing up ttrss"
129
 
129
 
138
 }
138
 }
139
 
139
 
140
 function restore_local_rss {
140
 function restore_local_rss {
141
-    if ! grep -q "RSS reader domain" $COMPLETION_FILE; then
141
+    if ! grep -q "rss reader domain" $COMPLETION_FILE; then
142
         return
142
         return
143
     fi
143
     fi
144
-    RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
144
+    RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
145
     if [ $RSS_READER_DOMAIN_NAME ]; then
145
     if [ $RSS_READER_DOMAIN_NAME ]; then
146
         echo $"Restoring ttrss"
146
         echo $"Restoring ttrss"
147
         temp_restore_dir=/root/tempttrss
147
         temp_restore_dir=/root/tempttrss
189
 }
189
 }
190
 
190
 
191
 function backup_remote_rss {
191
 function backup_remote_rss {
192
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
193
-        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
192
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
193
+        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
194
         if [ -d /etc/share/tt-rss ]; then
194
         if [ -d /etc/share/tt-rss ]; then
195
             function_check suspend_site
195
             function_check suspend_site
196
             suspend_site ${RSS_READER_DOMAIN_NAME}
196
             suspend_site ${RSS_READER_DOMAIN_NAME}
212
 }
212
 }
213
 
213
 
214
 function restore_remote_rss {
214
 function restore_remote_rss {
215
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
215
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
216
         echo $"Restoring ttrss"
216
         echo $"Restoring ttrss"
217
-        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
217
+        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
218
         function_check restore_database_from_friend
218
         function_check restore_database_from_friend
219
 
219
 
220
         function_check rss_create_database
220
         function_check rss_create_database
311
     fi
311
     fi
312
     cd $RSS_READER_PATH
312
     cd $RSS_READER_PATH
313
     git checkout $RSS_READER_COMMIT -b $RSS_READER_COMMIT
313
     git checkout $RSS_READER_COMMIT -b $RSS_READER_COMMIT
314
-    if ! grep -q "RSS reader commit" $COMPLETION_FILE; then
315
-        echo "RSS reader commit:$RSS_READER_COMMIT" >> $COMPLETION_FILE
314
+    if ! grep -q "rss reader commit" $COMPLETION_FILE; then
315
+        echo "rss reader commit:$RSS_READER_COMMIT" >> $COMPLETION_FILE
316
     fi
316
     fi
317
 
317
 
318
     function_check install_mariadb
318
     function_check install_mariadb
580
     if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
580
     if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
581
         if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then
581
         if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then
582
             sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE
582
             sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE
583
-            sed -i '/RSS mobile reader commit/d' $COMPLETION_FILE
583
+            sed -i '/rss mobile reader commit/d' $COMPLETION_FILE
584
             rm -rf $RSS_READER_PATH/g2ttree-mobile
584
             rm -rf $RSS_READER_PATH/g2ttree-mobile
585
         fi
585
         fi
586
     fi
586
     fi
598
     fi
598
     fi
599
     cd $RSS_MOBILE_READER_PATH
599
     cd $RSS_MOBILE_READER_PATH
600
     git checkout $RSS_MOBILE_READER_COMMIT -b $RSS_MOBILE_READER_COMMIT
600
     git checkout $RSS_MOBILE_READER_COMMIT -b $RSS_MOBILE_READER_COMMIT
601
-    if ! grep -q "RSS mobile reader commit" $COMPLETION_FILE; then
602
-        echo "RSS mobile reader commit:$RSS_MOBILE_READER_COMMIT" >> $COMPLETION_FILE
601
+    if ! grep -q "rss mobile reader commit" $COMPLETION_FILE; then
602
+        echo "rss mobile reader commit:$RSS_MOBILE_READER_COMMIT" >> $COMPLETION_FILE
603
     fi
603
     fi
604
 
604
 
605
     echo 'define({' > $RSS_MOBILE_READER_PATH/scripts/conf.js
605
     echo 'define({' > $RSS_MOBILE_READER_PATH/scripts/conf.js

+ 4
- 4
src/freedombone-app-webmail 查看文件

77
 
77
 
78
 function upgrade_webmail {
78
 function upgrade_webmail {
79
     function_check set_repo_commit
79
     function_check set_repo_commit
80
-    set_repo_commit $WEBMAIL_PATH "Webmail commit" "$WEBMAIL_COMMIT" $WEBMAIL_REPO
80
+    set_repo_commit $WEBMAIL_PATH "webmail commit" "$WEBMAIL_COMMIT" $WEBMAIL_REPO
81
 }
81
 }
82
 
82
 
83
 function backup_local_webmail {
83
 function backup_local_webmail {
159
         git_clone $WEBMAIL_REPO webmail
159
         git_clone $WEBMAIL_REPO webmail
160
         cd $WEBMAIL_PATH
160
         cd $WEBMAIL_PATH
161
         git checkout $WEBMAIL_COMMIT -b $WEBMAIL_COMMIT
161
         git checkout $WEBMAIL_COMMIT -b $WEBMAIL_COMMIT
162
-        if ! grep -q "Webmail commit" $COMPLETION_FILE; then
163
-            echo "Webmail commit:$WEBMAIL_COMMIT" >> $COMPLETION_FILE
162
+        if ! grep -q "webmail commit" $COMPLETION_FILE; then
163
+            echo "webmail commit:$WEBMAIL_COMMIT" >> $COMPLETION_FILE
164
         else
164
         else
165
-            sed -i "s/Webmail commit.*/Webmail commit:$WEBMAIL_COMMIT/g" $COMPLETION_FILE
165
+            sed -i "s/webmail commit.*/webmail commit:$WEBMAIL_COMMIT/g" $COMPLETION_FILE
166
         fi
166
         fi
167
     fi
167
     fi
168
     if [ ! -f $WEBMAIL_PATH/index.php ]; then
168
     if [ ! -f $WEBMAIL_PATH/index.php ]; then

+ 1
- 1
src/freedombone-controlpanel 查看文件

369
         fi
369
         fi
370
     done
370
     done
371
 
371
 
372
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
372
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
373
         if [ -d /var/lib/tor/hidden_service_ttrss ]; then
373
         if [ -d /var/lib/tor/hidden_service_ttrss ]; then
374
             echo -n -e "$(pad_string 'RSS reader')"
374
             echo -n -e "$(pad_string 'RSS reader')"
375
             RSSDOM='-'
375
             RSSDOM='-'

+ 2
- 0
src/freedombone-utils-upgrade 查看文件

76
     sed -i 's|Hubzilla|hubzilla|g' $COMPLETION_FILE
76
     sed -i 's|Hubzilla|hubzilla|g' $COMPLETION_FILE
77
     sed -i 's|Gogs|gogs|g' $COMPLETION_FILE
77
     sed -i 's|Gogs|gogs|g' $COMPLETION_FILE
78
     sed -i 's|Wiki|wiki|g' $COMPLETION_FILE
78
     sed -i 's|Wiki|wiki|g' $COMPLETION_FILE
79
+    sed -i 's|RSS|rss|g' $COMPLETION_FILE
80
+    sed -i 's|Webmail|webmail|g' $COMPLETION_FILE
79
 
81
 
80
     if [ -f /usr/local/bin/zeronetavahi ]; then
82
     if [ -f /usr/local/bin/zeronetavahi ]; then
81
         rm /usr/local/bin/zeronetavahi
83
         rm /usr/local/bin/zeronetavahi