fix question

README.md

@@ -1,8 +1,4 @@
-# This is...
+# Что это?
 
-Script that can install OS from previously rsynced backup on NAS
+Это скрипт, который восстанавливает систему из бекапа, расположенного на rsync сервере, оптимизирован под ArchLinux
 
-# TODO
-
-* some checks
-* config file support

restore.sh

@@ -1,4 +1,3 @@
-#!/bin/bash
 #not working encrypted setup
 
 #vars
@@ -6,8 +5,8 @@ IP="192.168.100.100"
 source="rsync@"$IP"/mnt/"
 bootSize=256M
 
+#prepare
 ##check for root
-testVars() {
 if [ `id -u` != 0 ] ; then 
     echo "==> Need to be root"
     exit 1
@@ -19,24 +18,24 @@ testVars() {
   echo "==> Host unavailable, exiting"
   exit 1
 fi
-}
 
-chooseBackup() {
+##check for space
-  ##get list of backups
+
 rsync_dir_list=($(rsync --password-file=rsync_pass rsync://$source | awk '{print $5}' | grep -v .DS_Store | grep -v "@Recently-Snapshot" | sort -r | head -n -1))
 
 ##choose backup
+
 echo "==>" ${#rsync_dir_list[@]} backups: ${rsync_dir_list[@]}
-  read -p "Input backup number:" backupNum
+read -p "Input backup name:" backupName
 
-  until [ $backupNum -le ${#rsync_dir_list[@]} ]
+echo "Selected: " $backupName
-  do
+
-  read -p "Input backup number:" backupNum
+#until [ $backupNum -le ${#rsync_dir_list[@]} ]
-  done
+#do
-  let "backupNum -= 1"
+#read -p "Input backup name:" backupName
-}
+#done
+#let "backupNum -= 1"
 
-setTargetDisk() {
 
 ##set target drive
 lsblk -o NAME,LABEL,FSTYPE,SIZE,MOUNTPOINT,MODEL
@@ -45,8 +44,9 @@ setTargetDisk() {
 read -p "Target drive is " targetDrive
 targetDrive=/dev/$targetDrive
 done
-  echo "Encrypted?"
+#encrypted?
-  while read -r -n 1 -s answer ; do
+echo "Encrypted? (Y/N)"
+while read -r -n 1 answer ; do
   if [[ $answer = [YyNn] ]]; then
     [[ $answer = [Yy] ]] && encryptedDevice=true && echo "WARNING You will be asked for password later" #read -p "Password: " encryptedPassword
     [[ $answer = [Nn] ]] && encryptedDevice=false
@@ -56,21 +56,23 @@ setTargetDisk() {
 
 #get swap size
 swapSize=$(free -m | grep "Mem" | awk '{print $2}')
+echo ""
 read -p "Enter extra amount of swap (empty == 512):" swapExtra
-  if [ -z "$swapExtra" ] && swapExtra=512
+[[ -z "$swapExtra" ]] && swapExtra=512
 let "swapSize += swapExtra" #add 512 mbs to swap for swap, not only hibernation
 swapSize=$swapSize"M"
-}
+
 #DEPLOY
 
-warnDeploy() {
 echo deployin\' ${rsync_dir_list[$backupNum]} on $targetDrive in 15s...
-  sleep 15
-  trap 'echo "==> Interrupted by user"; exit 1' 2
-}
 
-partitionDisk() {
+sleep 15
+
+
+trap 'echo "==> Interrupted by user"; exit 1' 2
+
 ##clear mbr for sure
+
 dd if=/dev/zero of=$targetDrive count=512
 
 ##fdisk
@@ -97,43 +99,36 @@ partitionDisk() {
 echo w
 ) | fdisk $targetDrive
     # IMHO this ^ is less obfuscated way
-}
 
-makeFS() {
 ##mkfs's
 echo "==> Making filesystems..."
-  echo "mkswap"
+echo "=> swap"
 mkswap $targetDrive"1"
-  echo "mkfs.vfat"
+echo "=> /boot"
 mkfs.vfat $targetDrive"2"
 
-  echo "mkfs.ext4"
+echo "=> rootfs"
-  if $encryptedDevice
+if $encryptedDevice ; then
-  then
 cryptsetup luksFormat -v $targetDrive"3"
 cryptsetup open $targetDrive"3" targetLuks
-  mkfs.ext4 /dev/mapper/targetLuks
+mkfs.ext4 -q /dev/mapper/targetLuks
 else
-  mkfs.ext4 $targetDrive"3"
+mkfs.ext4 -q $targetDrive"3"
 fi
-}
 
-getUUIDs() {
+sleep 15
+
 ##get disk's uuid
 echo "==> Got UUIDs!"
 UUIDS=($(blkid $targetDrive"1" $targetDrive"2" $targetDrive"3" -o value -s UUID))
-  if $encryptedDevice
+if $encryptedDevice ; then
-  then
 UUIDS[3]=UUIDS[2]
 UUIDS[2]=`blkid /dev/mapper/targetLuks -o value -s UUID`
 fi
-}
 
-mountDisk() {
 ##mount disks
 echo "==> Mounting..."
-  if $encryptedDevice
+if $encryptedDevice ; then
-  then
 mount /dev/mapper/targetLuks /mnt
 else
 mount $targetDrive"3" /mnt
@@ -141,19 +136,16 @@ mountDisk() {
 
 mkdir /mnt/boot
 mount $targetDrive"2" /mnt/boot
-}
 
-copyFiles() {
 ##rsync
 echo "==> Copying from NAS..."
-  rsync --archive --password-file=rsync_pass rsync://$source${rsync_dir_list[$backupNum]}/ /mnt/
+#rsync --archive --password-file=rsync_pass rsync://$source${rsync_dir_list[$backupNum]}/ /mnt/
+rsync --archive --password-file=rsync_pass rsync://$source$backupName/ /mnt/
 retVal=$?
 if [ $retVal -ne 0 ]; then
     exit 1
 fi
-}
 
-updateFstab() {
 ##update fstab
 echo "==> Updating fstab..."
 mv /mnt/etc/fstab /mnt/etc/fstab.orig
@@ -164,22 +156,15 @@ updateFstab() {
 
 echo "==> Result:"
 cat /mnt/etc/fstab
-}
-
-configBootloader() 
-{
 ##update grub linux options
-  if $encryptedDevice
+if $encryptedDevice ; then
 	cat /mnt/etc/default/grub | sed 's/cryptdevice=UUID=[A-Fa-f0-9-]*:cryptroot /cryptdevice=UUID='${UUIDS[3]}':cryptroot/' > /mnt/etc/default/grub 
 else
 	cat /mnt/etc/default/grub | sed 's/cryptdevice=UUID=[A-Fa-f0-9-]*:cryptroot //' > /mnt/etc/default/grub
 fi
 
 cat /mnt/etc/default/grub | sed 's/resume=UUID=[A-Fa-f0-9-]*/resume=UUID='${UUIDS[0]}'/' > /mnt/etc/default/grub
-}
 
-updateBootloader()
-{
 ##mount system stuff
 echo "==> Mounting /dev, /sys, /proc..."
 mount /dev /mnt/dev --bind
@@ -192,35 +177,16 @@ updateBootloader()
 #cat /mnt/etc/mkinitcpio.conf | sed 's/encrypt //' > /mnt/etc/mkinitcpio.conf #remove cryptdevice, no encrypted fs today :c
 
 #chroot env
-cat << EOF | chroot /mnt
+cat << EOF | chroot /mnt /bin/sh
 mkinitcpio -P
 grub-mkconfig -o /boot/grub/grub.cfg
 grub-install $targetDrive
 exit
 EOF
 
-}
-
-deinit()
-{
 #deinit
 echo "==> Syncing..."
 sync
 echo "==> Unmounting..."
 umount -R /mnt
 echo "==> Done!"
-}
-# funcions
-testVars()
-chooseBackup()
-setTargetDisk()
-warnDeploy()
-partitionDisk()
-makeFS()
-getUUIDs()
-mountDisk()
-copyFiles()
-updateFstab()
-configBootloader()
-updateBootloader()
-deinit()