Browse Source

Improved loops

Bob Mottram 9 years ago
parent
commit
5ca98a2050
3 changed files with 19 additions and 19 deletions
  1. 9
    9
      src/freedombone-addsipuser
  2. 7
    7
      src/freedombone-rmsipuser
  3. 3
    3
      src/freedombone-sipfreeext

+ 9
- 9
src/freedombone-addsipuser View File

43
 }
43
 }
44
 
44
 
45
 function sip_user_exists {
45
 function sip_user_exists {
46
-    for line in $(cat $CONFIG_FILE)
47
-    do
46
+    IFS=''
47
+    while read line; do
48
         if [[ "$line" == "<user id=\"$MY_USERNAME\">" ]]; then
48
         if [[ "$line" == "<user id=\"$MY_USERNAME\">" ]]; then
49
             USER_EXISTS="yes"
49
             USER_EXISTS="yes"
50
             return
50
             return
51
         fi
51
         fi
52
-    done
52
+    done < $CONFIG_FILE
53
 }
53
 }
54
 
54
 
55
 function update_sip_user {
55
 function update_sip_user {
59
         rm -f $NEW_CONFIG_FILE
59
         rm -f $NEW_CONFIG_FILE
60
     fi
60
     fi
61
     touch $NEW_CONFIG_FILE
61
     touch $NEW_CONFIG_FILE
62
-    for line in $(cat $CONFIG_FILE)
63
-    do
62
+    IFS=''
63
+    while read line; do
64
         if [ ! $USER_FOUND ]; then
64
         if [ ! $USER_FOUND ]; then
65
             if [[ "$line" == "<user id=\"$MY_USERNAME\">" ]]; then
65
             if [[ "$line" == "<user id=\"$MY_USERNAME\">" ]]; then
66
                 USER_FOUND="yes"
66
                 USER_FOUND="yes"
78
             fi              
78
             fi              
79
         fi
79
         fi
80
         echo $line >> $NEW_CONFIG_FILE
80
         echo $line >> $NEW_CONFIG_FILE
81
-    done
81
+    done < $CONFIG_FILE
82
     mv $NEW_CONFIG_FILE $CONFIG_FILE
82
     mv $NEW_CONFIG_FILE $CONFIG_FILE
83
 }
83
 }
84
 
84
 
88
         rm -f $NEW_CONFIG_FILE
88
         rm -f $NEW_CONFIG_FILE
89
     fi
89
     fi
90
     touch $NEW_CONFIG_FILE
90
     touch $NEW_CONFIG_FILE
91
-    for line in $(cat $CONFIG_FILE)
92
-    do
91
+    IFS=''
92
+    while read line; do
93
         if [[ "$line" == '</provision>' ]]; then
93
         if [[ "$line" == '</provision>' ]]; then
94
             echo "<user id=\"$MY_USERNAME\">" >> $NEW_CONFIG_FILE
94
             echo "<user id=\"$MY_USERNAME\">" >> $NEW_CONFIG_FILE
95
             echo "<extension>$EXTENSION</extension>" >> $NEW_CONFIG_FILE
95
             echo "<extension>$EXTENSION</extension>" >> $NEW_CONFIG_FILE
98
             echo '</user>' >> $NEW_CONFIG_FILE
98
             echo '</user>' >> $NEW_CONFIG_FILE
99
         fi
99
         fi
100
         echo $line >> $NEW_CONFIG_FILE
100
         echo $line >> $NEW_CONFIG_FILE
101
-    done
101
+    done < $CONFIG_FILE
102
     mv $NEW_CONFIG_FILE $CONFIG_FILE
102
     mv $NEW_CONFIG_FILE $CONFIG_FILE
103
     usermod -aG sipwitch $MY_USERNAME
103
     usermod -aG sipwitch $MY_USERNAME
104
 }
104
 }

+ 7
- 7
src/freedombone-rmsipuser View File

41
 }
41
 }
42
 
42
 
43
 function sip_user_exists {
43
 function sip_user_exists {
44
-    for line in $(cat $CONFIG_FILE)
45
-    do
44
+    IFS=''
45
+    while read line; do
46
         if [[ "$line" == "<user id=\"$MY_USERNAME\">" ]]; then
46
         if [[ "$line" == "<user id=\"$MY_USERNAME\">" ]]; then
47
             USER_EXISTS="yes"
47
             USER_EXISTS="yes"
48
             return
48
             return
49
         fi
49
         fi
50
-    done
50
+    done < $CONFIG_FILE
51
 }
51
 }
52
 
52
 
53
 function remove_sip_user {
53
 function remove_sip_user {
57
         rm -f $NEW_CONFIG_FILE
57
         rm -f $NEW_CONFIG_FILE
58
     fi
58
     fi
59
     touch $NEW_CONFIG_FILE
59
     touch $NEW_CONFIG_FILE
60
-    for line in $(cat $CONFIG_FILE)
61
-    do
60
+    IFS=''
61
+    while read line; do
62
         if [ ! $USER_FOUND ]; then
62
         if [ ! $USER_FOUND ]; then
63
             if [[ "$line" == "<user id=\"$MY_USERNAME\">" ]]; then
63
             if [[ "$line" == "<user id=\"$MY_USERNAME\">" ]]; then
64
                 USER_FOUND="yes"
64
                 USER_FOUND="yes"
65
             fi
65
             fi
66
         fi
66
         fi
67
         if [ ! $USER_FOUND ]; then
67
         if [ ! $USER_FOUND ]; then
68
-            echo $line >> $NEW_CONFIG_FILE
68
+            echo "$line" >> $NEW_CONFIG_FILE
69
         else
69
         else
70
             if [[ "$line" == '</user>' ]]; then
70
             if [[ "$line" == '</user>' ]]; then
71
                 USER_FOUND=
71
                 USER_FOUND=
72
             fi
72
             fi
73
         fi
73
         fi
74
-    done
74
+    done < $CONFIG_FILE
75
     mv $NEW_CONFIG_FILE $CONFIG_FILE
75
     mv $NEW_CONFIG_FILE $CONFIG_FILE
76
 }
76
 }
77
 
77
 

+ 3
- 3
src/freedombone-sipfreeext View File

34
 extensions=()
34
 extensions=()
35
 
35
 
36
 # get the used extensions
36
 # get the used extensions
37
-for line in $(cat $CONFIG_FILE)
38
-do
37
+IFS=''
38
+while read line; do
39
     if [[ "$line" == "<extension>"* ]]; then
39
     if [[ "$line" == "<extension>"* ]]; then
40
         ext=$(echo "$line" | awk -F '>' '{print $2}' | awk -F '<' '{print $1}')
40
         ext=$(echo "$line" | awk -F '>' '{print $2}' | awk -F '<' '{print $1}')
41
         extensions+=($ext)
41
         extensions+=($ext)
43
     if [[ "$line" == '</provision>' ]]; then
43
     if [[ "$line" == '</provision>' ]]; then
44
         break
44
         break
45
     fi
45
     fi
46
-done
46
+done < $CONFIG_FILE
47
 
47
 
48
 #echo "used extensions:"
48
 #echo "used extensions:"
49
 #echo $extensions
49
 #echo $extensions