|
@@ -3418,19 +3418,21 @@ function create_restore_script {
|
3418
|
3418
|
echo ' for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3419
|
3419
|
echo ' USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3420
|
3420
|
echo ' if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3421
|
|
- echo ' echo "Restoring personal settings for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3422
|
|
- echo ' restore_directory_from_usb /root/temppersonal personal/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3423
|
|
- echo ' if [ -d /home/$USERNAME/personal ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3424
|
|
- echo ' rm -rf /home/$USERNAME/personal' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3425
|
|
- echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3426
|
|
- echo -n " mv /root/temppersonal/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3421
|
+ echo ' if [ -d $USB_MOUNT/backup/personal/$USERNAME ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3422
|
+ echo ' echo "Restoring personal settings for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3423
|
+ echo ' restore_directory_from_usb /root/temppersonal personal/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3424
|
+ echo ' if [ -d /home/$USERNAME/personal ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3425
|
+ echo ' rm -rf /home/$USERNAME/personal' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3426
|
+ echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3427
|
+ echo -n " mv /root/temppersonal/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3427
|
3428
|
echo '$USERNAME/personal /home/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3428
|
|
- echo ' if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3429
|
|
- echo ' umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3430
|
|
- echo ' rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3431
|
|
- echo ' exit 184' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3429
|
+ echo ' if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3430
|
+ echo ' umount $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3431
|
+ echo ' rm -rf $USB_MOUNT' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3432
|
+ echo ' exit 184' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3433
|
+ echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
3434
|
+ echo ' rm -rf /root/temppersonal' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3432
|
3435
|
echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3433
|
|
- echo ' rm -rf /root/temppersonal' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3434
|
3436
|
echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3435
|
3437
|
echo ' done' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
3436
|
3438
|
echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|