Bob Mottram 8 years ago
parent
commit
907791ddbb

+ 2
- 2
src/freedombone-app-blog View File

@@ -244,7 +244,7 @@ function restore_local_blog {
244 244
         fi
245 245
         for d in /home/*/ ; do
246 246
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
247
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
247
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
248 248
                 if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
249 249
                     mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
250 250
                 fi
@@ -296,7 +296,7 @@ function restore_remote_blog {
296 296
         fi
297 297
         for d in /home/*/ ; do
298 298
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
299
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
299
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
300 300
                 if [ -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post ]; then
301 301
                     mv /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/*.md /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content/$USERNAME/blog/uncategorized/post
302 302
                 fi

+ 2
- 2
src/freedombone-app-emacs View File

@@ -49,7 +49,7 @@ function upgrade_emacs {
49 49
 function backup_local_emacs {
50 50
     for d in /home/*/ ; do
51 51
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
52
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
52
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
53 53
             if [ -d /home/$USERNAME/.emacs.d ]; then
54 54
                 echo $"Backing up Emacs config for $USERNAME"
55 55
                 if [ -f /home/$USERNAME/.emacs ]; then
@@ -67,7 +67,7 @@ function restore_local_emacs {
67 67
     if [ -d $USB_MOUNT/backup/emacs ]; then
68 68
         for d in $USB_MOUNT/backup/emacs/*/ ; do
69 69
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
70
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
70
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
71 71
                 if [ ! -d /home/$USERNAME ]; then
72 72
                     ${PROJECT_NAME}-adduser $USERNAME
73 73
                 fi

+ 1
- 1
src/freedombone-app-irc View File

@@ -61,7 +61,7 @@ function irc_set_global_password {
61 61
             # replace the password for all users
62 62
             for d in /home/*/ ; do
63 63
                 IRC_USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
64
-                if [[ $(is_valid_user $IRC_USERNAME) == "1" ]]; then
64
+                if [[ $(is_valid_user "$IRC_USERNAME") == "1" ]]; then
65 65
                     if [ -f /home/$IRC_USERNAME/.irssi/config ]; then
66 66
                         sed -i "s|$EXISTING_IRC_PASSWORD|$NEW_IRC_PASSWORD|g" /home/$IRC_USERNAME/.irssi/config
67 67
                         chown -R $IRC_USERNAME:$IRC_USERNAME /home/$IRC_USERNAME/.irssi

+ 2
- 2
src/freedombone-app-syncthing View File

@@ -278,7 +278,7 @@ function restore_local_syncthing {
278 278
     if [ -d $USB_MOUNT/backup/syncthing ]; then
279 279
         for d in $USB_MOUNT/backup/syncthing/*/ ; do
280 280
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
281
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
281
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
282 282
                 if [ ! -d /home/$USERNAME ]; then
283 283
                     ${PROJECT_NAME}-adduser $USERNAME
284 284
                 fi
@@ -366,7 +366,7 @@ function restore_remote_syncthing {
366 366
     if [ -d $SERVER_DIRECTORY/backup/syncthing ]; then
367 367
         for d in $SERVER_DIRECTORY/backup/syncthing/*/ ; do
368 368
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
369
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
369
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
370 370
                 if [ ! -d /home/$USERNAME ]; then
371 371
                     ${PROJECT_NAME}-adduser $USERNAME
372 372
                 fi

+ 1
- 1
src/freedombone-app-tahoelafs View File

@@ -50,7 +50,7 @@ function change_password_tahoelafs {
50 50
 function reconfigure_tahoelafs {
51 51
     for d in /home/*/ ; do
52 52
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
53
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
53
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
54 54
             if [ -d /home/$USERNAME/.tahoe ]; then
55 55
                 su -c "$TAHOE_COMMAND stop" - $USERNAME
56 56
                 rm -rf /home/$USERNAME/.tahoe

+ 1
- 1
src/freedombone-app-xmpp View File

@@ -246,7 +246,7 @@ function remove_xmpp {
246 246
 function xmpp_email_headers {
247 247
     for d in /home/*/ ; do
248 248
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
249
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
249
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
250 250
             if [ -f /home/$USERNAME/.muttrc ]; then
251 251
                 if ! grep -q "Jabber-ID" /home/$USERNAME/.muttrc; then
252 252
                     echo "my_hdr Jabber-ID: ${USERNAME}@${HOSTNAME}" >> /home/$USERNAME/.muttrc

+ 1
- 1
src/freedombone-archive-mail View File

@@ -37,7 +37,7 @@ source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-validation
37 37
 
38 38
 for d in /home/*/ ; do
39 39
     USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
40
-    if [[ $(is_valid_user $USERNAME) == "1" ]]; then
40
+    if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
41 41
         # for every user who has a mail directory
42 42
         if [ -d /home/$USERNAME/Maildir ]; then
43 43
             MUTTRC=/home/$USERNAME/.muttrc

+ 1
- 1
src/freedombone-backup-local View File

@@ -98,7 +98,7 @@ function backup_users {
98 98
     # Backup user files
99 99
     for d in /home/*/ ; do
100 100
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
101
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
101
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
102 102
 
103 103
             # Backup any gpg keys
104 104
             if [ -d /home/$USERNAME/.gnupg ]; then

+ 2
- 2
src/freedombone-backup-remote View File

@@ -122,7 +122,7 @@ function backup_configuration {
122 122
 function backup_users {
123 123
     for d in /home/*/ ; do
124 124
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
125
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
125
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
126 126
 
127 127
             # personal settings
128 128
             if [ -d /home/$USERNAME/personal ]; then
@@ -451,7 +451,7 @@ do
451 451
         # Social key management
452 452
         for d in /home/*/ ; do
453 453
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
454
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
454
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
455 455
                 disperse_key_shares $USERNAME $REMOTE_DOMAIN $REMOTE_SSH_PORT "$REMOTE_PASSWORD" $REMOTE_SERVER
456 456
             fi
457 457
         done

+ 1
- 1
src/freedombone-controlpanel View File

@@ -459,7 +459,7 @@ function show_users {
459 459
     echo '--------------------------------------------------------------------------'
460 460
     for d in /home/*/ ; do
461 461
         USRNAME=$(echo "$d" | awk -F '/' '{print $3}')
462
-        if [[ $(is_valid_user $USRNAME) == "1" ]]; then
462
+        if [[ $(is_valid_user "$USRNAME") == "1" ]]; then
463 463
             echo -n -e "$(pad_string ${USRNAME})"
464 464
             # get the SIP extension
465 465
             SIPEXT=

+ 11
- 11
src/freedombone-restore-local View File

@@ -238,7 +238,7 @@ function restore_mutt_settings {
238 238
     if [ -d $USB_MOUNT/backup/mutt ]; then
239 239
         for d in $USB_MOUNT/backup/mutt/*/ ; do
240 240
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
241
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
241
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
242 242
                 if [ ! -d /home/$USERNAME ]; then
243 243
                     ${PROJECT_NAME}-adduser $USERNAME
244 244
                 fi
@@ -272,7 +272,7 @@ function restore_gpg {
272 272
     if [ -d $USB_MOUNT/backup/gnupg ]; then
273 273
         for d in $USB_MOUNT/backup/gnupg/*/ ; do
274 274
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
275
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
275
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
276 276
                 if [ ! -d /home/$USERNAME ]; then
277 277
                     ${PROJECT_NAME}-adduser $USERNAME
278 278
                 fi
@@ -309,7 +309,7 @@ function restore_procmail {
309 309
     if [ -d $USB_MOUNT/backup/procmail ]; then
310 310
         for d in $USB_MOUNT/backup/procmail/*/ ; do
311 311
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
312
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
312
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
313 313
                 if [ ! -d /home/$USERNAME ]; then
314 314
                     ${PROJECT_NAME}-adduser $USERNAME
315 315
                 fi
@@ -338,7 +338,7 @@ function restore_spamassassin {
338 338
     if [ -d $USB_MOUNT/backup/spamassassin ]; then
339 339
         for d in $USB_MOUNT/backup/spamassassin/*/ ; do
340 340
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
341
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
341
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
342 342
                 if [ -d $USB_MOUNT/backup/spamassassin/$USERNAME ]; then
343 343
                     if [ ! -d /home/$USERNAME ]; then
344 344
                         ${PROJECT_NAME}-adduser $USERNAME
@@ -399,7 +399,7 @@ function restore_user_ssh_keys {
399 399
     if [ -d $USB_MOUNT/backup/ssh ]; then
400 400
         for d in $USB_MOUNT/backup/ssh/*/ ; do
401 401
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
402
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
402
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
403 403
                 if [ ! -d /home/$USERNAME ]; then
404 404
                     ${PROJECT_NAME}-adduser $USERNAME
405 405
                 fi
@@ -428,7 +428,7 @@ function restore_user_config {
428 428
     if [ -d $USB_MOUNT/backup/config ]; then
429 429
         for d in $USB_MOUNT/backup/config/*/ ; do
430 430
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
431
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
431
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
432 432
                 if [ ! -d /home/$USERNAME ]; then
433 433
                     ${PROJECT_NAME}-adduser $USERNAME
434 434
                 fi
@@ -469,7 +469,7 @@ function restore_user_monkeysphere {
469 469
     if [ -d $USB_MOUNT/backup/monkeysphere ]; then
470 470
         for d in $USB_MOUNT/backup/monkeysphere/*/ ; do
471 471
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
472
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
472
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
473 473
                 if [ ! -d /home/$USERNAME ]; then
474 474
                     ${PROJECT_NAME}-adduser $USERNAME
475 475
                 fi
@@ -508,7 +508,7 @@ function restore_user_fin {
508 508
     if [ -d $USB_MOUNT/backup/fin ]; then
509 509
         for d in $USB_MOUNT/backup/fin/*/ ; do
510 510
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
511
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
511
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
512 512
                 if [ ! -d /home/$USERNAME ]; then
513 513
                     ${PROJECT_NAME}-adduser $USERNAME
514 514
                 fi
@@ -537,7 +537,7 @@ function restore_user_local {
537 537
     if [ -d $USB_MOUNT/backup/local ]; then
538 538
         for d in $USB_MOUNT/backup/local/*/ ; do
539 539
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
540
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
540
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
541 541
                 if [ ! -d /home/$USERNAME ]; then
542 542
                     ${PROJECT_NAME}-adduser $USERNAME
543 543
                 fi
@@ -610,7 +610,7 @@ function restore_personal_settings {
610 610
     if [ -d $USB_MOUNT/backup/personal ]; then
611 611
         for d in $USB_MOUNT/backup/personal/*/ ; do
612 612
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
613
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
613
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
614 614
                 if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then
615 615
                     if [ ! -d /home/$USERNAME ]; then
616 616
                         ${PROJECT_NAME}-adduser $USERNAME
@@ -663,7 +663,7 @@ function restore_email {
663 663
     if [ -d $USB_MOUNT/backup/mail ]; then
664 664
         for d in $USB_MOUNT/backup/mail/*/ ; do
665 665
             USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
666
-            if [[ $(is_valid_user $USERNAME) == "1" ]]; then
666
+            if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
667 667
                 if [ ! -d /home/$USERNAME ]; then
668 668
                     ${PROJECT_NAME}-adduser $USERNAME
669 669
                 fi

+ 11
- 11
src/freedombone-restore-remote View File

@@ -227,7 +227,7 @@ function restore_mutt_settings {
227 227
     fi
228 228
     for d in $SERVER_DIRECTORY/backup/mutt/*/ ; do
229 229
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
230
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
230
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
231 231
             if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then
232 232
                 if [ ! -d /home/$USERNAME ]; then
233 233
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -259,7 +259,7 @@ function restore_gpg {
259 259
     fi
260 260
     for d in $SERVER_DIRECTORY/backup/gnupg/*/ ; do
261 261
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
262
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
262
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
263 263
             if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then
264 264
                 if [ ! -d /home/$USERNAME ]; then
265 265
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -292,7 +292,7 @@ function restore_procmail {
292 292
     fi
293 293
     for d in $SERVER_DIRECTORY/backup/procmail/*/ ; do
294 294
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
295
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
295
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
296 296
             if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then
297 297
                 if [ ! -d /home/$USERNAME ]; then
298 298
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -319,7 +319,7 @@ function restore_spamassassin {
319 319
     fi
320 320
     for d in $SERVER_DIRECTORY/backup/spamassassin/*/ ; do
321 321
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
322
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
322
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
323 323
             if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then
324 324
                 if [ ! -d /home/$USERNAME ]; then
325 325
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -365,7 +365,7 @@ function restore_ssh_keys {
365 365
     fi
366 366
     for d in $SERVER_DIRECTORY/backup/ssh/*/ ; do
367 367
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
368
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
368
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
369 369
             if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then
370 370
                 if [ ! -d /home/$USERNAME ]; then
371 371
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -392,7 +392,7 @@ function restore_user_config {
392 392
     fi
393 393
     for d in $SERVER_DIRECTORY/backup/config/*/ ; do
394 394
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
395
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
395
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
396 396
             if [ -d $SERVER_DIRECTORY/backup/config/$USERNAME ]; then
397 397
                 if [ ! -d /home/$USERNAME ]; then
398 398
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -431,7 +431,7 @@ function restore_user_monkeysphere {
431 431
     fi
432 432
     for d in $SERVER_DIRECTORY/backup/monkeysphere/*/ ; do
433 433
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
434
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
434
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
435 435
             if [ -d $SERVER_DIRECTORY/backup/monkeysphere/$USERNAME ]; then
436 436
                 if [ ! -d /home/$USERNAME ]; then
437 437
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -468,7 +468,7 @@ function restore_user_fin {
468 468
     fi
469 469
     for d in $SERVER_DIRECTORY/backup/fin/*/ ; do
470 470
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
471
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
471
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
472 472
             if [ -d $SERVER_DIRECTORY/backup/fin/$USERNAME ]; then
473 473
                 if [ ! -d /home/$USERNAME ]; then
474 474
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -495,7 +495,7 @@ function restore_user_local {
495 495
     fi
496 496
     for d in $SERVER_DIRECTORY/backup/local/*/ ; do
497 497
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
498
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
498
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
499 499
             if [ -d $SERVER_DIRECTORY/backup/local/$USERNAME ]; then
500 500
                 if [ ! -d /home/$USERNAME ]; then
501 501
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -563,7 +563,7 @@ function restore_personal_settings {
563 563
     fi
564 564
     for d in $SERVER_DIRECTORY/backup/personal/*/ ; do
565 565
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
566
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
566
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
567 567
             if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then
568 568
                 if [ ! -d /home/$USERNAME ]; then
569 569
                     ${PROJECT_NAME}-adduser $USERNAME
@@ -610,7 +610,7 @@ function restore_email {
610 610
     fi
611 611
     for d in $SERVER_DIRECTORY/backup/mail/*/ ; do
612 612
         USERNAME=$(echo "$d" | awk -F '/' '{print $6}')
613
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
613
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
614 614
             if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then
615 615
                 if [ ! -d /home/$USERNAME ]; then
616 616
                     ${PROJECT_NAME}-adduser $USERNAME

+ 2
- 2
src/freedombone-sec View File

@@ -338,7 +338,7 @@ function send_monkeysphere_server_keys_to_users {
338 338
     monkeysphere_server_keys=$(monkeysphere-host show-key | grep $"OpenPGP fingerprint" | awk -F ' ' '{print $3}')
339 339
     for d in /home/*/ ; do
340 340
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
341
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
341
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
342 342
             if [ ! -d /home/$USERNAME/.monkeysphere ]; then
343 343
                 mkdir /home/$USERNAME/.monkeysphere
344 344
             fi
@@ -956,7 +956,7 @@ function export_settings {
956 956
 function refresh_gpg_keys {
957 957
     for d in /home/*/ ; do
958 958
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
959
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
959
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
960 960
             su -c 'gpg --refresh-keys' - $USERNAME
961 961
         fi
962 962
     done

+ 5
- 5
src/freedombone-syncthing View File

@@ -99,7 +99,7 @@ function create_syncthing_config {
99 99
 
100 100
     for d in /home/*/ ; do
101 101
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
102
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
102
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
103 103
             echo "    <folder id=\"$USERNAME\" path=\"/home/$USERNAME/Sync/\" ro=\"false\" rescanIntervalS=\"60\" ignorePerms=\"false\" autoNormalize=\"true\">" >> $SYNCTHING_CONFIG_FILE
104 104
             # include any specified device IDs for this user
105 105
             if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
@@ -139,7 +139,7 @@ function create_syncthing_config {
139 139
     echo "" > $TEMP_IDS_FILE
140 140
     for d in /home/*/ ; do
141 141
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
142
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
142
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
143 143
             if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
144 144
                 while read -r line || [[ -n "$line" ]]; do
145 145
                     line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
@@ -179,7 +179,7 @@ function create_syncthing_config {
179 179
     echo "" > $TEMP_IDS_FILE
180 180
     for d in /home/*/ ; do
181 181
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
182
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
182
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
183 183
             if [ -f /home/$USERNAME/$SYNCTHING_USER_IDS_FILE ]; then
184 184
                 while read -r line || [[ -n "$line" ]]; do
185 185
                     line2="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
@@ -238,7 +238,7 @@ function create_syncthing_config {
238 238
     # This allows it to appear within the user control panel
239 239
     for d in /home/*/ ; do
240 240
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
241
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
241
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
242 242
             echo "$SYNCTHING_ID" > /home/$USERNAME/.syncthing-server-id
243 243
             chown $USERNAME:$USERNAME /home/$USERNAME/.syncthing-server-id
244 244
         fi
@@ -259,7 +259,7 @@ function user_devices_changed {
259 259
 
260 260
     for d in /home/*/ ; do
261 261
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
262
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
262
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
263 263
             if [ -f /home/$USERNAME/$SYNCTHING_UPDATE_FILE ]; then
264 264
                 CHANGED=1
265 265
             fi

+ 1
- 1
src/freedombone-utils-backup View File

@@ -275,7 +275,7 @@ function set_user_permissions {
275 275
     echo $"Setting permissions"
276 276
     for d in /home/*/ ; do
277 277
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
278
-        if [[ $(is_valid_user $USERNAME) == "1" ]]; then
278
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
279 279
             chown -R $USERNAME:$USERNAME /home/$USERNAME
280 280
         fi
281 281
     done