free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Tidying

Bob Mottram 9 years ago
parent
015ed78265
commit
e1e9e5b4da
3 changed files with 39 additions and 33 deletions
Unified View Show Diff Stats
  1. 13
    11
      src/freedombone
  2. 13
    11
      src/freedombone-addcert
  3. 13
    11
      src/freedombone-upgrade

+ 13
- 11
src/freedombone View File

948 
 }
 948 
 }
949
949
950 
 function read_repo_servers {
 950 
 function read_repo_servers {
951 
-    if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
952 
-        FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
953 
-    fi
954 
-    if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
955 
-        FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
956 
-    fi
957 
-    if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
958 
-        MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
959 
-    fi
960 
-    if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
961 
-        FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
951 
+    if [ -f $CONFIGURATION_FILE ]; then
952 
+        if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
953 
+            FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
954 
+        fi
955 
+        if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
956 
+            FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
957 
+        fi
958 
+        if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
959 
+            MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
960 
+        fi
961 
+        if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
962 
+            FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
963 
+        fi
962 
     fi
 964 
     fi
963
965
964 
     if [ ! $FRIENDS_TROVE_SERVER ]; then
 966 
     if [ ! $FRIENDS_TROVE_SERVER ]; then

+ 13
- 11
src/freedombone-addcert View File

56 
 MY_TROVE_PASSWORD=
 56 
 MY_TROVE_PASSWORD=
57
57
58 
 function read_repo_servers {
 58 
 function read_repo_servers {
59 
-    if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
60 
-        FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
61 
-    fi
62 
-    if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
63 
-        FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
64 
-    fi
65 
-    if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
66 
-        MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
67 
-    fi
68 
-    if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
69 
-        FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
59 
+    if [ -f $CONFIGURATION_FILE ]; then
60 
+        if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
61 
+            FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
62 
+        fi
63 
+        if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
64 
+            FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
65 
+        fi
66 
+        if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
67 
+            MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
68 
+        fi
69 
+        if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
70 
+            FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
71 
+        fi
70 
     fi
 72 
     fi
71
73
72 
     if [ ! $FRIENDS_TROVE_SERVER ]; then
 74 
     if [ ! $FRIENDS_TROVE_SERVER ]; then

+ 13
- 11
src/freedombone-upgrade View File

43 
 MY_TROVE_PASSWORD=
 43 
 MY_TROVE_PASSWORD=
44
44
45 
 function read_repo_servers {
 45 
 function read_repo_servers {
46 
-    if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
47 
-        FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
48 
-    fi
49 
-    if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
50 
-        FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
51 
-    fi
52 
-    if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
53 
-        MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
54 
-    fi
55 
-    if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
56 
-        FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
46 
+    if [ -f $CONFIGURATION_FILE ]; then
47 
+        if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
48 
+            FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
49 
+        fi
50 
+        if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
51 
+            FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
52 
+        fi
53 
+        if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
54 
+            MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
55 
+        fi
56 
+        if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
57 
+            FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
58 
+        fi
57 
     fi
 59 
     fi
58
60
59 
     if [ ! $FRIENDS_TROVE_SERVER ]; then
 61 
     if [ ! $FRIENDS_TROVE_SERVER ]; then