Hopefully added the last screenshots and some fixes

This commit is contained in:
Patrick Neumann 2020-12-03 22:39:16 +01:00
parent 992f1da53c
commit 7704660286
7 changed files with 31 additions and 25 deletions

View File

@ -103,14 +103,16 @@ check_dep "${MMLS_BIN}" "sleuthkit"
check_dep "${OPENSSL_BIN}" "openssl" check_dep "${OPENSSL_BIN}" "openssl"
check_dep "${SED_BIN}" "sed" check_dep "${SED_BIN}" "sed"
check_ext "${SOURCE}" "[eE]01|dd|DD|raw|RAW|img|IMG" check_ext "${SOURCE}" "[eE]01"
check_tmp
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# A little bit of configuration before the magic. # A little bit of configuration before the magic.
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
readonly OFFSET="$( choose_partition "${SOURCE}" | ${AWK_BIN} -F "_" '{ print $3; }' )" readonly OFFSET="$( choose_partition "${SOURCE}" | ${AWK_BIN} -F "_" '{ print $3; }' )"
readonly TIMEZONE="${DIRNAME}/timezone.txt" readonly TIMEZONE="${TMP}/${OFFSET}-timezone.txt"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# A wonder maybe takes "a little bit" longer... :-/ # A wonder maybe takes "a little bit" longer... :-/
@ -122,35 +124,38 @@ if ${FSSTAT_BIN} -o "${OFFSET}" "${SOURCE}" > /dev/null 2>&1 ; then
| ${AWK_BIN} '$3=='"${OFFSET}"' { print $0; }' \ | ${AWK_BIN} '$3=='"${OFFSET}"' { print $0; }' \
>> "${TIMEZONE}" >> "${TIMEZONE}"
localtime="$( ${IFIND_BIN} -o "${OFFSET}" \ lt_inode="$( ${IFIND_BIN} -o "${OFFSET}" \
-n "/etc/localtime" \ -n "/etc/localtime" \
"${SOURCE}" )" "${SOURCE}" )"
if [ "${localtime}" != "File not found" ] ; then if [ "${lt_inode}" != "File not found" ] ; then
symlink="$( ${ISTAT_BIN} -o "${OFFSET}" "${SOURCE}" "${localtime}" \ symlink="$( ${ISTAT_BIN} -o "${OFFSET}" "${SOURCE}" "${lt_inode}" \
| ${AWK_BIN} -F ":" '/Symbolic link to/ { sub( /.*\/usr\/share\/zoneinfo\//, "", $2 ); print $2 }' )" | ${AWK_BIN} -F ":" '/symbolic link to/ { sub( /.*\/usr\/share\/zoneinfo\//, "", $2 ); print $2 }' )"
echo -e -n " Information from \"/etc/localtime\":\n " >> "${TIMEZONE}" echo -e -n " Information from \"/etc/localtime\":\n " >> "${TIMEZONE}"
if [ -n "${symlink}" ] ; then if [ -n "${symlink}" ] ; then
echo "${symlink}" >> "${TIMEZONE}" echo "${symlink}" >> "${TIMEZONE}"
else else
md5="$( ${ICAT_BIN} -o "${OFFSET}" "${SOURCE}" "${localtime}" \ lt_md5="$( ${ICAT_BIN} -o "${OFFSET}" \
| ${OPENSSL_BIN} md5 \ "${SOURCE}" \
| ${AWK_BIN} '{ print $NF; }' )" "${lt_inode}" \
usz="$( ${IFIND_BIN} -o "${OFFSET}" -n "/usr/share/zoneinfo" "${SOURCE}" )" | ${OPENSSL_BIN} dgst -md5 \
OLDIFS=$IFS ; IFS=$'\n' | ${AWK_BIN} '{ print $NF; }' )"
for zoneinfo in $( ${FLS_BIN} -r -p -o "${OFFSET}" "${SOURCE}" "${usz}" ) ; do zi_inode="$( ${IFIND_BIN} -o "${OFFSET}" \
inode="$( echo "${zoneinfo}" \ -n "/usr/share/zoneinfo" \
| ${SED_BIN} -r 's/(.*[[:space:]])([[:digit:]]+)(:[[:space:]].*)/\2/' )" "${SOURCE}" )"
if ${ICAT_BIN} -o "${OFFSET}" "${SOURCE}" "${inode}" \ zoneinfo="$( ${FLS_BIN} -o "${OFFSET}" \
| ${OPENSSL_BIN} md5 \ -m "/usr/share/zoneinfo" \
| ${GREP_BIN} --fixed-strings "${md5}" > /dev/null 2>&1 ; then -h \
echo "${zoneinfo}" | ${AWK_BIN} '{ print $NF; }' >> "${TIMEZONE}" -r \
fi "${SOURCE}" \
done "${zi_inode}" \
IFS=$OLDIFS | ${GREP_BIN} --invert-match --fixed-strings "deleted" \
| ${AWK_BIN} --field-separator "|" \
'/'"${lt_md5}"'/ { sub( /.*\/usr\/share\/zoneinfo\//, "", $2 ); print $2; }' )"
echo "${zoneinfo}" >> "${TIMEZONE}"
fi fi
echo >> "${TIMEZONE}" echo >> "${TIMEZONE}"
else else
echo -e " Symbolic link \"/private/etc/localtime\" not found.\n" echo -e " \"/etc/localtime\" not found.\n"
fi fi
timezone="$( ${IFIND_BIN} -o "${OFFSET}" -n "/etc/timezone" "${SOURCE}" )" timezone="$( ${IFIND_BIN} -o "${OFFSET}" -n "/etc/timezone" "${SOURCE}" )"

View File

@ -114,7 +114,8 @@ readonly HASHCAT="${DIRNAME}/$( ${BASENAME_BIN} "${SOURCE}" )-hashcat-dictionary
# We need force if we use an intel GPU with "broken" OpenCL! # We need force if we use an intel GPU with "broken" OpenCL!
# (need years!!!) # (need years!!!)
# #
# Actually not working with nVidia (OpenCL and/or Cuda)! # Actually not working with nVidia (OpenCL and/or Cuda):
# https://www.archlinux.org/news/nvidia-45528-is-incompatible-with-linux-59/
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
if [ ! -f "${HASHCAT}" ] ; then if [ ! -f "${HASHCAT}" ] ; then
${GTERMINAL_BIN} --hide-menubar -- \ ${GTERMINAL_BIN} --hide-menubar -- \

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB