Browse Source

lower case

Bob Mottram 8 years ago
parent
commit
05cf51f3ba
2 changed files with 8 additions and 8 deletions
  1. 3
    3
      src/freedombone-app-rss
  2. 5
    5
      src/freedombone-syncthing

+ 3
- 3
src/freedombone-app-rss View File

535
 
535
 
536
     # update to the next commit
536
     # update to the next commit
537
     function_check set_repo_commit
537
     function_check set_repo_commit
538
-    set_repo_commit $RSS_READER_GNUSOCIAL_PATH "RSS reader gnusocial commit" "$RSS_READER_GNUSOCIAL_COMMIT" $RSS_READER_GNUSOCIAL_REPO
538
+    set_repo_commit $RSS_READER_GNUSOCIAL_PATH "rss reader gnusocial commit" "$RSS_READER_GNUSOCIAL_COMMIT" $RSS_READER_GNUSOCIAL_REPO
539
     chown -R www-data:www-data $RSS_READER_GNUSOCIAL_PATH
539
     chown -R www-data:www-data $RSS_READER_GNUSOCIAL_PATH
540
 
540
 
541
     if grep -Fxq "install_rss_gnusocial" $COMPLETION_FILE; then
541
     if grep -Fxq "install_rss_gnusocial" $COMPLETION_FILE; then
556
     cp -r $INSTALL_DIR/ttrss-gnusocial $RSS_READER_GNUSOCIAL_PATH
556
     cp -r $INSTALL_DIR/ttrss-gnusocial $RSS_READER_GNUSOCIAL_PATH
557
     cd $RSS_READER_GNUSOCIAL_PATH
557
     cd $RSS_READER_GNUSOCIAL_PATH
558
     git checkout $RSS_READER_GNUSOCIAL_COMMIT -b $RSS_READER_GNUSOCIAL_COMMIT
558
     git checkout $RSS_READER_GNUSOCIAL_COMMIT -b $RSS_READER_GNUSOCIAL_COMMIT
559
-    if ! grep -q "RSS reader gnusocial commit" $COMPLETION_FILE; then
560
-        echo "RSS reader gnusocial commit:$RSS_READER_GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
559
+    if ! grep -q "rss reader gnusocial commit" $COMPLETION_FILE; then
560
+        echo "rss reader gnusocial commit:$RSS_READER_GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
561
     fi
561
     fi
562
     chown -R www-data:www-data $RSS_READER_GNUSOCIAL_PATH
562
     chown -R www-data:www-data $RSS_READER_GNUSOCIAL_PATH
563
 
563
 

+ 5
- 5
src/freedombone-syncthing View File

72
 }
72
 }
73
 
73
 
74
 function create_syncthing_config {
74
 function create_syncthing_config {
75
-    if grep -q "Syncthing ID" $COMPLETION_FILE; then
76
-        SYNCTHING_ID=$(cat $COMPLETION_FILE | grep "Syncthing ID" | awk -F ':' '{print $2}')
75
+    if grep -q "syncthing ID" $COMPLETION_FILE; then
76
+        SYNCTHING_ID=$(cat $COMPLETION_FILE | grep "syncthing ID" | awk -F ':' '{print $2}')
77
     else
77
     else
78
         if [ -f $SYNCTHING_CONFIG_FILE ]; then
78
         if [ -f $SYNCTHING_CONFIG_FILE ]; then
79
             SYNCTHING_ID=$(cat $SYNCTHING_CONFIG_FILE | grep "device id=" | head -n 1 | awk -F '"' '{print $2}')
79
             SYNCTHING_ID=$(cat $SYNCTHING_CONFIG_FILE | grep "device id=" | head -n 1 | awk -F '"' '{print $2}')
82
         fi
82
         fi
83
     fi
83
     fi
84
 
84
 
85
-    if ! grep -q "Syncthing ID" $COMPLETION_FILE; then
86
-        echo "Syncthing ID:$SYNCTHING_ID" >> $COMPLETION_FILE
85
+    if ! grep -q "syncthing ID" $COMPLETION_FILE; then
86
+        echo "syncthing ID:$SYNCTHING_ID" >> $COMPLETION_FILE
87
     else
87
     else
88
-        sed -i "s|Syncthing ID.*|Syncthing ID:$SYNCTHING_ID|g" $COMPLETION_FILE
88
+        sed -i "s|syncthing ID.*|syncthing ID:$SYNCTHING_ID|g" $COMPLETION_FILE
89
     fi
89
     fi
90
 
90
 
91
     if [ ! -d $SYNCTHING_CONFIG_PATH ]; then
91
     if [ ! -d $SYNCTHING_CONFIG_PATH ]; then