diff --git a/sysdump.sh b/sysdump.sh index 230c371..717391c 100755 --- a/sysdump.sh +++ b/sysdump.sh @@ -79,7 +79,6 @@ sysdump() { echo "Bash version is ${BASH_VERSION}" >> "${LOG_FILE}" echo "Current working directory is ${PWD}" >> "${LOG_FILE}" echo "Current user is $(whoami)" >> "${LOG_FILE}" - echo "${DUMP_DELIMITER}" # Populate users path USER_DIRS=() if [ $(id -u) -eq 0 ] @@ -92,7 +91,10 @@ sysdump() { else USER_DIRS+=($HOME) fi + echo "Considered home directories in this dump are:" >> "${LOG_FILE}" + for hp in "${USER_DIRS[@]}"; do echo " - ${hp}" >> "${LOG_FILE}"; done # Start dump + echo "${DUMP_DELIMITER}" echo "{" USE_COMMA=1 # safecat @@ -135,10 +137,7 @@ sysdump() { dump "free" safecmd free -h dump "df" safecmd df -h dump "boot_folder" safecmd ls -R /boot/ - for hp in "${USER_DIRS[@]}" - do - dump "home_${hp}" safecmd ls -al ${hp} - done + for hp in "${USER_DIRS[@]}"; do dump "home_${hp}" safecmd ls -al ${hp}; done dump "root_folder" safecmd ls -al / dump "uid" safecmd id -u dump "gid" safecmd id -g @@ -255,6 +254,7 @@ then shift for entry in $@ do + echo "====================> $entry" >&2 safegetentry ${entry} done exit 0 @@ -331,10 +331,7 @@ then echo echo "====> Disk <====" [ -z "$INFO_DISKS" ] && echo "ERROR: No disks informations (require df)" - if [ ! -z "$INFO_DISKS" ] - then - echo "${INFO_DISKS}" - fi + [ ! -z "$INFO_DISKS" ] && echo "${INFO_DISKS}" echo echo "====> Kernel Config <====" [ -z "$KERNEL_CONFIG" ] && echo "ERROR: Kernel config not found"