浏览代码

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,7 +83,7 @@ function reconfigure_rss {
83 83
 function upgrade_rss {
84 84
     if grep -Fxq "install_rss" $COMPLETION_FILE; then
85 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 87
         function_check rss_modifications
88 88
         rss_modifications
89 89
     fi
@@ -104,26 +104,26 @@ function upgrade_rss {
104 104
         if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
105 105
             if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then
106 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 108
                 rm -rf $RSS_READER_PATH/g2ttree-mobile
109 109
             fi
110 110
         fi
111 111
 
112 112
         # update to the next commit
113 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 115
     fi
116 116
 }
117 117
 
118 118
 function backup_local_rss {
119 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 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 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 128
             echo $"Backing up ttrss"
129 129
 
@@ -138,10 +138,10 @@ function backup_local_rss {
138 138
 }
139 139
 
140 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 142
         return
143 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 145
     if [ $RSS_READER_DOMAIN_NAME ]; then
146 146
         echo $"Restoring ttrss"
147 147
         temp_restore_dir=/root/tempttrss
@@ -189,8 +189,8 @@ function restore_local_rss {
189 189
 }
190 190
 
191 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 194
         if [ -d /etc/share/tt-rss ]; then
195 195
             function_check suspend_site
196 196
             suspend_site ${RSS_READER_DOMAIN_NAME}
@@ -212,9 +212,9 @@ function backup_remote_rss {
212 212
 }
213 213
 
214 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 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 218
         function_check restore_database_from_friend
219 219
 
220 220
         function_check rss_create_database
@@ -311,8 +311,8 @@ function install_rss_main {
311 311
     fi
312 312
     cd $RSS_READER_PATH
313 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 316
     fi
317 317
 
318 318
     function_check install_mariadb
@@ -580,7 +580,7 @@ function install_rss_mobile_reader {
580 580
     if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
581 581
         if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then
582 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 584
             rm -rf $RSS_READER_PATH/g2ttree-mobile
585 585
         fi
586 586
     fi
@@ -598,8 +598,8 @@ function install_rss_mobile_reader {
598 598
     fi
599 599
     cd $RSS_MOBILE_READER_PATH
600 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 603
     fi
604 604
 
605 605
     echo 'define({' > $RSS_MOBILE_READER_PATH/scripts/conf.js

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

@@ -77,7 +77,7 @@ function reconfigure_webmail {
77 77
 
78 78
 function upgrade_webmail {
79 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 83
 function backup_local_webmail {
@@ -159,10 +159,10 @@ function install_webmail {
159 159
         git_clone $WEBMAIL_REPO webmail
160 160
         cd $WEBMAIL_PATH
161 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 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 166
         fi
167 167
     fi
168 168
     if [ ! -f $WEBMAIL_PATH/index.php ]; then

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

@@ -369,7 +369,7 @@ function show_domains {
369 369
         fi
370 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 373
         if [ -d /var/lib/tor/hidden_service_ttrss ]; then
374 374
             echo -n -e "$(pad_string 'RSS reader')"
375 375
             RSSDOM='-'

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

@@ -76,6 +76,8 @@ function upgrade_installation_from_previous_versions {
76 76
     sed -i 's|Hubzilla|hubzilla|g' $COMPLETION_FILE
77 77
     sed -i 's|Gogs|gogs|g' $COMPLETION_FILE
78 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 82
     if [ -f /usr/local/bin/zeronetavahi ]; then
81 83
         rm /usr/local/bin/zeronetavahi