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

Don't use tar during backup and restore

Bob Mottram 10 years ago
parent
aac0cdce05
commit
d8188b3ec8
1 changed files with 166 additions and 46 deletions
Split View Show Diff Stats
  1. 166
    46
      install-freedombone.sh

+ 166
- 46
install-freedombone.sh View File 

@@ -774,6 +774,7 @@ function create_backup_script {
774 774 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
775 775 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
776 776 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
777 
+
777 778 
   echo '# Backup projects' >> /usr/bin/$BACKUP_SCRIPT_NAME
778 779 
   echo "if [ -d /home/$MY_USERNAME/projects ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
779 780 
   echo '  echo "Backing up projects"' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -788,6 +789,7 @@ function create_backup_script {
788 789 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
789 790 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
790 791 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
792 
+
791 793 
   echo '# Backup personal settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
792 794 
   echo "if [ -d /home/$MY_USERNAME/personal ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
793 795 
   echo '  echo "Backing up personal settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -802,6 +804,7 @@ function create_backup_script {
802 804 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
803 805 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
804 806 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
807 
+
805 808 
   echo '# Backup the public mailing list' >> /usr/bin/$BACKUP_SCRIPT_NAME
806 809 
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
807 810 
   echo '  echo "Backing up the public mailing list"' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -816,6 +819,7 @@ function create_backup_script {
816 819 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
817 820 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
818 821 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
822 
+
819 823 
   echo '# Backup xmpp settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
820 824 
   echo "if [ -d $XMPP_DIRECTORY ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
821 825 
   echo '  echo "Backing up the XMPP settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -830,41 +834,102 @@ function create_backup_script {
830 834 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
831 835 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
832 836 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
833 
-  #echo '# Backup web content' >> /usr/bin/$BACKUP_SCRIPT_NAME
834 
-  #echo 'echo "Backing up web content"' >> /usr/bin/$BACKUP_SCRIPT_NAME
835 
-  #echo "if [ ! -d $USB_MOUNT/backup/www ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
836 
-  #echo "  mkdir -p $USB_MOUNT/backup/www" >> /usr/bin/$BACKUP_SCRIPT_NAME
837 
-  #echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
838 
-  #echo "rsyncrypto  -v -r /var/www $USB_MOUNT/backup/www $USB_MOUNT/backup/www.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
839 
-  #echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
840 
-  echo '# Backup other stuff' >> /usr/bin/$BACKUP_SCRIPT_NAME
841 
-  echo '# Put some files into a temporary directory so that they can be easily backed up' >> /usr/bin/$BACKUP_SCRIPT_NAME
842 
-  echo "if [ ! -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
843 
-  echo "  mkdir /home/$MY_USERNAME/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
837 
+
838 
+  echo '# Backup gpg keys' >> /usr/bin/$BACKUP_SCRIPT_NAME
839 
+  echo "if [ -d /home/$MY_USERNAME/.gnupg ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
840 
+  echo '  echo "Backing up gpg keys"' >> /usr/bin/$BACKUP_SCRIPT_NAME
841 
+  echo "  if [ ! -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
842 
+  echo "    mkdir -p $USB_MOUNT/backup/gnupg" >> /usr/bin/$BACKUP_SCRIPT_NAME
843 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
844 
+  echo "  rsyncrypto  -v -r /home/$MY_USERNAME/.gnupg $USB_MOUNT/backup/gnupg $USB_MOUNT/backup/gnupg.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
845 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
846 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
847 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
848 
+  echo '    exit 491' >> /usr/bin/$BACKUP_SCRIPT_NAME
849 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
844 850 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
845 
-  echo 'echo "Backing up miscellaneous files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
846 
-  echo "if [ ! -d $USB_MOUNT/backup/misc ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
847 
-  echo "  mkdir -p $USB_MOUNT/backup/misc" >> /usr/bin/$BACKUP_SCRIPT_NAME
851 
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
852 
+
853 
+  echo '# Backup web sites' >> /usr/bin/$BACKUP_SCRIPT_NAME
854 
+  echo "if [ -d /etc/nginx ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
855 
+  echo '  echo "Backing up web settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
856 
+  echo "  if [ ! -d $USB_MOUNT/backup/web ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
857 
+  echo "    mkdir -p $USB_MOUNT/backup/web" >> /usr/bin/$BACKUP_SCRIPT_NAME
858 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
859 
+  echo "  rsyncrypto  -v -r /etc/nginx/sites-available $USB_MOUNT/backup/web $USB_MOUNT/backup/web.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
860 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
861 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
862 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
863 
+  echo '    exit 848' >> /usr/bin/$BACKUP_SCRIPT_NAME
864 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
848 865 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
849 
-  echo "tar -czvf /home/$MY_USERNAME/tempfiles/miscfiles.tar.gz /home/$MY_USERNAME/.gnupg /home/$MY_USERNAME/.muttrc /home/$MY_USERNAME/.procmailrc /home/$MY_USERNAME/.ssh /etc/nginx/sites-available /home/$MY_USERNAME/README" >> /usr/bin/$BACKUP_SCRIPT_NAME
850 
-  echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
851 
-  echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
852 
-  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
853 
-  echo '  exit 495' >> /usr/bin/$BACKUP_SCRIPT_NAME
866 
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
867 
+
868 
+  echo '# Backup README file' >> /usr/bin/$BACKUP_SCRIPT_NAME
869 
+  echo "if [ -f /home/$MY_USERNAME/README ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
870 
+  echo '  echo "Backing up README"' >> /usr/bin/$BACKUP_SCRIPT_NAME
871 
+  echo "  if [ ! -d $USB_MOUNT/backup/readme ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
872 
+  echo "    mkdir -p $USB_MOUNT/backup/readme" >> /usr/bin/$BACKUP_SCRIPT_NAME
873 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
874 
+  echo "  if [ ! -d /home/$MY_USERNAME/tempbackup ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
875 
+  echo "    mkdir -p /home/$MY_USERNAME/tempbackup" >> /usr/bin/$BACKUP_SCRIPT_NAME
876 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
877 
+  echo "  rsyncrypto  -v -r /home/$MY_USERNAME/tempbackup $USB_MOUNT/backup/readme $USB_MOUNT/backup/readme.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
878 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
879 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
880 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
881 
+  echo "    rm -rf /home/$MY_USERNAME/tempbackup" >> /usr/bin/$BACKUP_SCRIPT_NAME
882 
+  echo '    exit 848' >> /usr/bin/$BACKUP_SCRIPT_NAME
883 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
884 
+  echo "  rm -rf /home/$MY_USERNAME/tempbackup" >> /usr/bin/$BACKUP_SCRIPT_NAME
854 885 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
855 
-  echo "rsyncrypto  -v -r /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
856 
-  echo 'if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
857 
-  echo "  umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
858 
-  echo "  rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
859 
-  echo '  exit 496' >> /usr/bin/$BACKUP_SCRIPT_NAME
886 
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
887 
+
888 
+  echo '# Backup Mutt settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
889 
+  echo "if [ -f /home/$MY_USERNAME/.muttrc ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
890 
+  echo '  echo "Backing up Mutt settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
891 
+  echo "  if [ ! -d /home/$MY_USERNAME/tempbackup ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
892 
+  echo "    mkdir -p /home/$MY_USERNAME/tempbackup" >> /usr/bin/$BACKUP_SCRIPT_NAME
893 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
894 
+  echo "  cp /home/$MY_USERNAME/.muttrc /home/$MY_USERNAME/tempbackup" >> /usr/bin/$BACKUP_SCRIPT_NAME
895 
+  echo '  if [ -f /etc/Muttrc ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
896 
+  echo "    cp /etc/Muttrc /home/$MY_USERNAME/tempbackup" >> /usr/bin/$BACKUP_SCRIPT_NAME
897 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
898 
+  echo "  if [ ! -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
899 
+  echo "    mkdir -p $USB_MOUNT/backup/mutt" >> /usr/bin/$BACKUP_SCRIPT_NAME
900 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
901 
+  echo "  rsyncrypto  -v -r /home/$MY_USERNAME/tempbackup $USB_MOUNT/backup/mutt $USB_MOUNT/backup/mutt.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
902 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
903 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
904 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
905 
+  echo '    rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
906 
+  echo '    exit 492' >> /usr/bin/$BACKUP_SCRIPT_NAME
907 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
908 
+  echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
860 909 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
861 
-  echo '# Remove temporary files' >> /usr/bin/$BACKUP_SCRIPT_NAME
862 
-  echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
863 
-  echo '  echo "Removing temporary files"' >> /usr/bin/$BACKUP_SCRIPT_NAME
864 
-  echo "  shred -zu /home/$MY_USERNAME/tempfiles/*" >> /usr/bin/$BACKUP_SCRIPT_NAME
865 
-  echo "  rm -rf /home/$MY_USERNAME/tempfiles" >> /usr/bin/$BACKUP_SCRIPT_NAME
910 
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
911 
+
912 
+  echo '# Backup procmail settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
913 
+  echo "if [ -f /home/$MY_USERNAME/.procmailrc ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
914 
+  echo '  echo "Backing up procmail settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
915 
+  echo "  if [ ! -d /home/$MY_USERNAME/tempbackup ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
916 
+  echo "    mkdir -p /home/$MY_USERNAME/tempbackup" >> /usr/bin/$BACKUP_SCRIPT_NAME
917 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
918 
+  echo "  cp /home/$MY_USERNAME/.procmailrc /home/$MY_USERNAME/tempbackup" >> /usr/bin/$BACKUP_SCRIPT_NAME
919 
+  echo "  if [ ! -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
920 
+  echo "    mkdir -p $USB_MOUNT/backup/procmail" >> /usr/bin/$BACKUP_SCRIPT_NAME
921 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
922 
+  echo "  rsyncrypto  -v -r /home/$MY_USERNAME/tempbackup $USB_MOUNT/backup/procmail $USB_MOUNT/backup/procmail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
923 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
924 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
925 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
926 
+  echo '    rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
927 
+  echo '    exit 492' >> /usr/bin/$BACKUP_SCRIPT_NAME
928 
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
929 
+  echo '  rm -rf /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
866 930 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
867 931 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
932 
+
868 933 
   echo '# Backup email' >> /usr/bin/$BACKUP_SCRIPT_NAME
869 934 
   echo "if [ -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
870 935 
   echo '  echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -879,6 +944,7 @@ function create_backup_script {
879 944 
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
880 945 
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
881 946 
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
947 
+
882 948 
   echo '# Backup DLNA cache' >> /usr/bin/$BACKUP_SCRIPT_NAME
883 949 
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
884 950 
   echo '  echo "Backing up DLNA cache"' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -1046,6 +1112,77 @@ function create_restore_script {
1046 1112 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1047 1113 
   fi
1048 1114
1115 
+  echo "if [ -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1116 
+  echo '  echo "Restoring Mutt settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1117 
+  echo '  mkdir /root/tempmutt' >> /usr/bin/$RESTORE_SCRIPT_NAME
1118 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/mutt /root/tempmutt $USB_MOUNT/backup/mutt.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1119 
+  echo "  if [ -f /root/tempmutt/usb/backup/mutt/$MY_USERNAME/tempbackup/.muttrc ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1120 
+  echo "    cp -f /root/tempmutt/usb/backup/mutt/$MY_USERNAME/tempbackup/.muttrc /home/$MY_USERNAME/.muttrc" >> /usr/bin/$RESTORE_SCRIPT_NAME
1121 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1122 
+  echo "  if [ -f /root/tempmutt/usb/backup/mutt/$MY_USERNAME/tempbackup/Muttrc ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1123 
+  echo "    cp -f /root/tempmutt/usb/backup/mutt/$MY_USERNAME/tempbackup/Muttrc /etc/Muttrc" >> /usr/bin/$RESTORE_SCRIPT_NAME
1124 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1125 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1126 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1127 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1128 
+  echo '    rm -rf /root/tempmutt' >> /usr/bin/$RESTORE_SCRIPT_NAME
1129 
+  echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
1130 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1131 
+  echo '  rm -rf /root/tempmutt' >> /usr/bin/$RESTORE_SCRIPT_NAME
1132 
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1133 
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1134 
+
1135 
+  echo "if [ -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1136 
+  echo '  echo "Restoring gnupg settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1137 
+  echo '  mkdir /root/tempgnupg' >> /usr/bin/$RESTORE_SCRIPT_NAME
1138 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/gnupg /root/tempgnupg $USB_MOUNT/backup/gnupg.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1139 
+  echo "  cp -r /root/tempmutt/usb/backup/gnupg/$MY_USERNAME/* /home/$MY_USERNAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1140 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1141 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1142 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1143 
+  echo '    rm -rf /root/tempgnupg' >> /usr/bin/$RESTORE_SCRIPT_NAME
1144 
+  echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
1145 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1146 
+  echo '  rm -rf /root/tempgnupg' >> /usr/bin/$RESTORE_SCRIPT_NAME
1147 
+  echo '  cp -r /home/$MY_USERNAME/.gnupg /root' >> /usr/bin/$RESTORE_SCRIPT_NAME
1148 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1149 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1150 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1151 
+  echo '    exit 283' >> /usr/bin/$RESTORE_SCRIPT_NAME
1152 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1153 
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1154 
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1155 
+
1156 
+  echo "if [ -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1157 
+  echo '  echo "Restoring procmail settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1158 
+  echo '  mkdir /root/tempprocmail' >> /usr/bin/$RESTORE_SCRIPT_NAME
1159 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/procmail /root/tempprocmail $USB_MOUNT/backup/procmail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1160 
+  echo "  cp -r /root/tempprocmail/usb/backup/procmail/$MY_USERNAME/tempbackup/* /home/$MY_USERNAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1161 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1162 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1163 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1164 
+  echo '    rm -rf /root/tempprocmail' >> /usr/bin/$RESTORE_SCRIPT_NAME
1165 
+  echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
1166 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1167 
+  echo '  rm -rf /root/tempprocmail' >> /usr/bin/$RESTORE_SCRIPT_NAME
1168 
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1169 
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1170 
+
1171 
+  echo "if [ -d $USB_MOUNT/backup/readme ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1172 
+  echo '  echo "Restoring README"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1173 
+  echo '  mkdir /root/tempreadme' >> /usr/bin/$RESTORE_SCRIPT_NAME
1174 
+  echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/readme /root/tempreadme $USB_MOUNT/backup/readme.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1175 
+  echo "  cp -r /root/tempreadme/usb/backup/readme/$MY_USERNAME/tempbackup/* /home/$MY_USERNAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1176 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1177 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1178 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1179 
+  echo '    rm -rf /root/tempreadme' >> /usr/bin/$RESTORE_SCRIPT_NAME
1180 
+  echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
1181 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1182 
+  echo '  rm -rf /root/tempreadme' >> /usr/bin/$RESTORE_SCRIPT_NAME
1183 
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1184 
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1185 
+
1049 1186 
   echo "if [ -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1050 1187 
   echo '  echo "Restoring certificates"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1051 1188 
   echo '  mkdir /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -1127,23 +1264,6 @@ function create_restore_script {
1127 1264 
   #echo "rsyncrypto -v -d -r $USB_MOUNT/backup/www /var/www $USB_MOUNT/www.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1128 1265 
   #echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1129 1266
1130 
-  echo 'echo "Restoring miscellaneous files"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1131 
-  echo "if [ -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1132 
-  echo "  shred -zu /home/$MY_USERNAME/tempfiles/*" >> /usr/bin/$RESTORE_SCRIPT_NAME
1133 
-  echo 'else' >> /usr/bin/$RESTORE_SCRIPT_NAME
1134 
-  echo "  mkdir -p /home/$MY_USERNAME/tempfiles" >> /usr/bin/$RESTORE_SCRIPT_NAME
1135 
-  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1136 
-  echo "rsyncrypto -v -d -r $USB_MOUNT/backup/misc /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1137 
-  echo "tar -xzvf /home/$MY_USERNAME/tempfiles/usb/backup/misc/$MY_USERNAME/tempfiles/miscfiles.tar.gz -C /" >> /usr/bin/$RESTORE_SCRIPT_NAME
1138 
-  echo "chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
1139 
-  echo 'if [ -d /home/$MY_USERNAME/.gnupg ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1140 
-  echo '  cp -r /home/$MY_USERNAME/.gnupg /root' >> /usr/bin/$RESTORE_SCRIPT_NAME
1141 
-  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1142 
-  echo 'echo "Removing temporary files"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1143 
-  echo "rm -rf /home/$MY_USERNAME/tempfiles" >> /usr/bin/$RESTORE_SCRIPT_NAME
1144 
-  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1145 
-  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1146 
-
1147 1267 
   BACKUP_INCLUDES_WEBSITES="no"
1148 1268
1149 1269 
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then