Ver código fonte

optionally specify USB drive for backup and restore

Bob Motram 10 anos atrás
pai
commit
cfa2084609
1 arquivos alterados com 16 adições e 4 exclusões
  1. 16
    4
      src/freedombone

+ 16
- 4
src/freedombone Ver arquivo

@@ -1456,14 +1456,20 @@ function create_backup_script {
1456 1456
 
1457 1457
   echo '#!/bin/bash' > /usr/bin/$BACKUP_SCRIPT_NAME
1458 1458
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
1459
-  echo "if [ ! -b $USB_DRIVE ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
1459
+  echo "USB_DRIVE=$USB_DRIVE" >> /usr/bin/$BACKUP_SCRIPT_NAME
1460
+  echo 'if [ $1 ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
1461
+  echo '  USB_DRIVE=/dev/${1}1' >> /usr/bin/$BACKUP_SCRIPT_NAME
1462
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
1463
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
1464
+  echo 'if [ ! -b $USB_DRIVE ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
1460 1465
   echo '  echo "Please attach a USB drive"' >> /usr/bin/$BACKUP_SCRIPT_NAME
1461 1466
   echo '  exit 1' >> /usr/bin/$BACKUP_SCRIPT_NAME
1462 1467
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
1463 1468
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
1464 1469
   echo "if [ ! -d $USB_MOUNT ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
1465 1470
   echo "  mkdir $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
1466
-  echo "  mount $USB_DRIVE $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
1471
+  echo -n '  mount $USB_DRIVE ' >> /usr/bin/$BACKUP_SCRIPT_NAME
1472
+  echo "$USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
1467 1473
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
1468 1474
   echo "if [ ! -d $USB_MOUNT/backup ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
1469 1475
   echo "  mkdir $USB_MOUNT/backup" >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -1965,14 +1971,20 @@ function create_restore_script {
1965 1971
 
1966 1972
   echo '#!/bin/bash' > /usr/bin/$RESTORE_SCRIPT_NAME
1967 1973
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1968
-  echo "if [ ! -b $USB_DRIVE ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1974
+  echo "USB_DRIVE=$USB_DRIVE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1975
+  echo 'if [ $1 ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1976
+  echo '  USB_DRIVE=/dev/${1}1' >> /usr/bin/$RESTORE_SCRIPT_NAME
1977
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1978
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1979
+  echo 'if [ ! -b $USB_DRIVE ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1969 1980
   echo '  echo "Please attach a USB drive"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1970 1981
   echo '  exit 1' >> /usr/bin/$RESTORE_SCRIPT_NAME
1971 1982
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1972 1983
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1973 1984
   echo "if [ ! -d $USB_MOUNT ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1974 1985
   echo "  mkdir $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1975
-  echo "  mount $USB_DRIVE $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1986
+  echo -n '  mount $USB_DRIVE ' >> /usr/bin/$RESTORE_SCRIPT_NAME
1987
+  echo "$USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1976 1988
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1977 1989
   echo "if [ ! -d $USB_MOUNT/backup ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1978 1990
   echo '  echo "No backup directory found on the USB drive."' >> /usr/bin/$RESTORE_SCRIPT_NAME