Explorar el Código

Better name lookup

Bob Mottram hace 9 años
padre
commit
e455f557a1
Se han modificado 1 ficheros con 1 adiciones y 2 borrados
  1. 1
    2
      src/freedombone

+ 1
- 2
src/freedombone Ver fichero

@@ -2417,8 +2417,6 @@ function get_mariadb_owncloud_admin_password {
2417 2417
 
2418 2418
 function backup_directory_to_usb {
2419 2419
   echo 'function backup_directory_to_usb {' >> /usr/bin/$BACKUP_SCRIPT_NAME
2420
-  echo "  MY_NAME=\"$MY_NAME\"" >> /usr/bin/$BACKUP_SCRIPT_NAME
2421
-  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2422 2420
   echo '  if [ ! -d ${1} ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2423 2421
   echo '    echo "WARNING: directory does not exist: ${1}"' >> /usr/bin/$BACKUP_SCRIPT_NAME
2424 2422
   echo '  else' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2508,6 +2506,7 @@ function create_backup_script {
2508 2506
   echo 'if [ $2 ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2509 2507
   echo '  MY_USERNAME=$2' >> /usr/bin/$BACKUP_SCRIPT_NAME
2510 2508
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
2509
+  echo 'MY_NAME=$(getent passwd $MY_USERNAME | cut -d: -f5 | cut -d, -f1)' >> /usr/bin/$BACKUP_SCRIPT_NAME
2511 2510
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
2512 2511
   echo 'if [ ! -b $USB_DRIVE ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
2513 2512
   echo '  echo "Please attach a USB drive"' >> /usr/bin/$BACKUP_SCRIPT_NAME