소스 검색

Formatting shenanigans

Bob Mottram 9 년 전
부모
커밋
b319afecdb
1개의 변경된 파일26개의 추가작업 그리고 26개의 파일을 삭제
  1. 26
    26
      src/freedombone

+ 26
- 26
src/freedombone 파일 보기

@@ -2669,7 +2669,7 @@ function create_backup_script {
2669 2669
 
2670 2670
   echo '# Backup projects' >> /usr/bin/$BACKUP_SCRIPT_NAME
2671 2671
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_SCRIPT_NAME
2672
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2672
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2673 2673
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2674 2674
   echo '    if [ -d /home/$USERNAME/projects ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2675 2675
   echo '      echo "Backing up projects for $USERNAME"' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2684,7 +2684,7 @@ function create_backup_script {
2684 2684
 
2685 2685
   echo '# Backup personal settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
2686 2686
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_SCRIPT_NAME
2687
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2687
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2688 2688
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2689 2689
   echo '    if [ -d /home/$USERNAME/personal ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2690 2690
   echo '      echo "Backing up personal settings for $USERNAME"' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2719,7 +2719,7 @@ function create_backup_script {
2719 2719
 
2720 2720
   echo '# Backup gpg keys' >> /usr/bin/$BACKUP_SCRIPT_NAME
2721 2721
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_SCRIPT_NAME
2722
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2722
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2723 2723
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2724 2724
   echo '    if [ -d /home/$USERNAME/.gnupg ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2725 2725
   echo '      echo "Backing up gpg keys for $USERNAME"' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2734,7 +2734,7 @@ function create_backup_script {
2734 2734
 
2735 2735
   echo '# Backup ssh keys' >> /usr/bin/$BACKUP_SCRIPT_NAME
2736 2736
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_SCRIPT_NAME
2737
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2737
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2738 2738
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2739 2739
   echo '    if [ -d /home/$USERNAME/.ssh ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2740 2740
   echo '      echo "Backing up ssh keys for $USERNAME"' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2783,7 +2783,7 @@ function create_backup_script {
2783 2783
 
2784 2784
   echo '# Backup Mutt settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
2785 2785
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_SCRIPT_NAME
2786
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2786
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2787 2787
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2788 2788
   echo '    if [ -f /home/$USERNAME/.muttrc ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2789 2789
   echo '      echo "Backing up Mutt settings for $USERNAME"' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2805,7 +2805,7 @@ function create_backup_script {
2805 2805
 
2806 2806
   echo '# Backup procmail settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
2807 2807
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_SCRIPT_NAME
2808
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2808
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2809 2809
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2810 2810
   echo '    if [ -f /home/$USERNAME/.procmailrc ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2811 2811
   echo '      echo "Backing up procmail settings for $USERNAME"' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2824,7 +2824,7 @@ function create_backup_script {
2824 2824
 
2825 2825
   echo '# Backup spamassassin settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
2826 2826
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_SCRIPT_NAME
2827
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2827
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2828 2828
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2829 2829
   echo '    if [ -d /home/$USERNAME/.spamassassin ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2830 2830
   echo '      echo "Backing up spamassassin settings for $USERNAME"' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2839,7 +2839,7 @@ function create_backup_script {
2839 2839
 
2840 2840
   echo '# Backup email' >> /usr/bin/$BACKUP_SCRIPT_NAME
2841 2841
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_SCRIPT_NAME
2842
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2842
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_SCRIPT_NAME
2843 2843
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2844 2844
   echo '    if [ -d /home/$USERNAME/Maildir ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2845 2845
   echo '      echo "Creating an email archive for $USERNAME"' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -3766,7 +3766,7 @@ function create_restore_script {
3766 3766
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3767 3767
   echo 'echo "Setting permissions"' >> /usr/bin/$RESTORE_SCRIPT_NAME
3768 3768
   echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
3769
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
3769
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
3770 3770
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3771 3771
   echo '    chown -R $USERNAME:$USERNAME /home/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
3772 3772
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -4108,7 +4108,7 @@ function backup_to_friends_servers {
4108 4108
 
4109 4109
   echo '# Backup projects' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4110 4110
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4111
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4111
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4112 4112
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4113 4113
   echo '    if [ -d /home/$USERNAME/projects ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4114 4114
   echo '      echo "Backing up projects for $USERNAME"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4123,7 +4123,7 @@ function backup_to_friends_servers {
4123 4123
 
4124 4124
   echo '# Backup personal settings' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4125 4125
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4126
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4126
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4127 4127
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4128 4128
   echo '    if [ -d /home/$USERNAME/personal ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4129 4129
   echo '      echo "Backing up personal settings for $USERNAME"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4158,7 +4158,7 @@ function backup_to_friends_servers {
4158 4158
 
4159 4159
   echo '# Backup gpg keys' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4160 4160
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4161
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4161
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4162 4162
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4163 4163
   echo '    if [ -d /home/$USERNAME/.gnupg ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4164 4164
   echo '      echo "Backing up gpg keys for $USERNAME"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4173,7 +4173,7 @@ function backup_to_friends_servers {
4173 4173
 
4174 4174
   echo '# Backup ssh keys' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4175 4175
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4176
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4176
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4177 4177
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4178 4178
   echo '    if [ -d /home/$USERNAME/.ssh ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4179 4179
   echo '      echo "Backing up ssh keys for $USERNAME"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4222,7 +4222,7 @@ function backup_to_friends_servers {
4222 4222
 
4223 4223
   echo '# Backup Mutt settings' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4224 4224
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4225
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4225
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4226 4226
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4227 4227
   echo '    if [ -f /home/$USERNAME/.muttrc ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4228 4228
   echo '      echo "Backing up Mutt settings for $USERNAME"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4244,7 +4244,7 @@ function backup_to_friends_servers {
4244 4244
 
4245 4245
   echo '# Backup procmail settings' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4246 4246
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4247
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4247
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4248 4248
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4249 4249
   echo '    if [ -f /home/$USERNAME/.procmailrc ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4250 4250
   echo '      echo "Backing up procmail settings for $USERNAME"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4263,7 +4263,7 @@ function backup_to_friends_servers {
4263 4263
 
4264 4264
   echo '# Backup spamassassin settings' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4265 4265
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4266
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4266
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4267 4267
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4268 4268
   echo '    if [ -d /home/$USERNAME/.spamassassin ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4269 4269
   echo '      echo "Backing up spamassassin settings for $USERNAME"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4278,7 +4278,7 @@ function backup_to_friends_servers {
4278 4278
 
4279 4279
   echo '# Backup email' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4280 4280
   echo 'for d in /home/*/ ; do' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4281
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4281
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4282 4282
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4283 4283
   echo '    if [ -d /home/$USERNAME/Maildir ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
4284 4284
   echo '      echo "Creating an email archive"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4692,7 +4692,7 @@ function restore_from_friend {
4692 4692
       RESTORE_SUBDIR='remoterestore/backup/mutt/'
4693 4693
   fi
4694 4694
   echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4695
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4695
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4696 4696
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4697 4697
   echo '    if [ -d $SERVER_DIRECTORY/backup/mutt/$USERNAME ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4698 4698
   echo '      echo "Restoring Mutt settings for $USERNAME"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -4722,7 +4722,7 @@ function restore_from_friend {
4722 4722
       RESTORE_SUBDIR='remoterestore/backup/gnupg'
4723 4723
   fi
4724 4724
   echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4725
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4725
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4726 4726
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4727 4727
   echo '    if [ -d $SERVER_DIRECTORY/backup/gnupg/$USERNAME ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4728 4728
   echo '      echo "Restoring gnupg settings for $USERNAME"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -4750,7 +4750,7 @@ function restore_from_friend {
4750 4750
       RESTORE_SUBDIR='remoterestore/backup/procmail'
4751 4751
   fi
4752 4752
   echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4753
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4753
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4754 4754
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4755 4755
   echo '    if [ -d $SERVER_DIRECTORY/backup/procmail/$USERNAME ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4756 4756
   echo '      echo "Restoring procmail settings for $USERNAME"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -4772,7 +4772,7 @@ function restore_from_friend {
4772 4772
       RESTORE_SUBDIR='remoterestore/backup/spamassassin'
4773 4773
   fi
4774 4774
   echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4775
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4775
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4776 4776
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4777 4777
   echo '    if [ -d $SERVER_DIRECTORY/backup/spamassassin/$USERNAME ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4778 4778
   echo '      echo "Restoring spamassassin settings for $USERNAME"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -4828,7 +4828,7 @@ function restore_from_friend {
4828 4828
       RESTORE_SUBDIR='remoterestore/backup/ssh'
4829 4829
   fi
4830 4830
   echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4831
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4831
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4832 4832
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4833 4833
   echo '    if [ -d $SERVER_DIRECTORY/backup/ssh/$USERNAME ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4834 4834
   echo '      echo "Restoring ssh keys for $USERNAME"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -4866,7 +4866,7 @@ function restore_from_friend {
4866 4866
       RESTORE_SUBDIR='remoterestore/backup/projects'
4867 4867
   fi
4868 4868
   echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4869
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4869
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4870 4870
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4871 4871
   echo '    if [ -d $SERVER_DIRECTORY/backup/projects/$USERNAME ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4872 4872
   echo '      echo "Restoring projects for $USERNAME"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -4890,7 +4890,7 @@ function restore_from_friend {
4890 4890
       RESTORE_SUBDIR='remoterestore/backup/personal'
4891 4891
   fi
4892 4892
   echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4893
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4893
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4894 4894
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4895 4895
   echo '    if [ -d $SERVER_DIRECTORY/backup/personal/$USERNAME ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
4896 4896
   echo '      echo "Restoring personal settings for $USERNAME"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -5183,7 +5183,7 @@ function restore_from_friend {
5183 5183
       RESTORE_SUBDIR='remoterestore/backup/mail'
5184 5184
   fi
5185 5185
   echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
5186
-  echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
5186
+  echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
5187 5187
   echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
5188 5188
   echo '    if [ -d $SERVER_DIRECTORY/backup/mail/$USERNAME ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
5189 5189
   echo '      echo "Restoring emails for $USERNAME"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -5220,7 +5220,7 @@ function restore_from_friend {
5220 5220
   if [[ $ENABLE_SOCIAL_KEY_MANAGEMENT == "yes" ]]; then
5221 5221
       echo '' >> /usr/bin/$RESTORE_FROM_FRIENDS_SCRIPT_NAME
5222 5222
       echo 'for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
5223
-      echo '  USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
5223
+      echo '  USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
5224 5224
       echo '  if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
5225 5225
       echo '    # Retrieve key fragments for $USERNAME' >> /usr/bin/$RESTORE_FROM_FRIENDS_SCRIPT_NAME
5226 5226
       echo -n '    /usr/bin/sshpass -p $REMOTE_PASSWORD ' >> /usr/bin/$RESTORE_FROM_FRIENDS_SCRIPT_NAME