diff --git a/drives.sh b/drives.sh index 2aa2587..2eec6a6 100644 --- a/drives.sh +++ b/drives.sh @@ -1,36 +1,25 @@ #!/bin/bash -echo "💽 Drive Report" -echo "==============================" - -# Get all physical disks (not partitions) -DISKS=$(lsblk -d -n -o NAME) - -for disk in $DISKS; do - DEV="/dev/$disk" - - SIZE=$(lsblk -d -n -o SIZE "$DEV") - MODEL=$(lsblk -d -n -o MODEL "$DEV" | sed 's/ *$//') - TRAN=$(lsblk -d -n -o TRAN "$DEV") - ROTA=$(cat /sys/block/$disk/queue/rotational 2>/dev/null) - - TYPE="Unknown" - - # NVMe drives are typically M.2 (or PCIe SSD) - if [[ "$disk" == nvme* ]]; then - TYPE="M.2 / NVMe SSD" - else - if [[ "$ROTA" == "1" ]]; then - TYPE="HDD (Rotational)" - elif [[ "$ROTA" == "0" ]]; then - TYPE="SSD" - fi - fi - - echo "Device: $DEV" - echo "Model : ${MODEL:-Unknown}" - echo "Size : $SIZE" - echo "Bus : ${TRAN:-Unknown}" - echo "Type : $TYPE" - echo "------------------------------" -done +function drives(){ + local OUT_FILE=$1 + DISKS=$(lsblk -d -n -o NAME,TYPE | awk '$2=="disk"{print $1}') + for disk in $DISKS; do + DEV="/dev/$disk" + SIZE=$(lsblk -d -n -o SIZE "$DEV") + MODEL=$(lsblk -d -n -o MODEL "$DEV" | sed 's/ *$//') + TRAN=$(lsblk -d -n -o TRAN "$DEV") + ROTA=$(cat /sys/block/$disk/queue/rotational 2>/dev/null) + TYPE="Unknown" + # NVMe drives are typically M.2 (or PCIe SSD) + if [[ "$disk" == nvme* ]]; then + TYPE="M.2 / NVMe SSD" + else + if [[ "$ROTA" == "1" ]]; then + TYPE="HDD" + elif [[ "$ROTA" == "0" ]]; then + TYPE="SSD" + fi + fi + echo -e "DEV:$DEV\tSIZE:$SIZE\tTYPE:$TYPE" >>"$OUT_FILE" + done +} diff --git a/speaker.sh b/speaker.sh new file mode 100755 index 0000000..d3984b6 --- /dev/null +++ b/speaker.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +audacious ./stereo_test.mp3 >/dev/null 2>&1 & disown + +read -p "Funktioniert Sound? Audacios öffnet sich - (y/n): " answer + +if [[ "$answer" == [Yy] ]]; then + return 0 +elif [[ "$answer" == [Nn] ]]; then + return 1 +else + return 1 +fi \ No newline at end of file diff --git a/stereo_test.mp3 b/stereo_test.mp3 new file mode 100644 index 0000000..825d0b0 Binary files /dev/null and b/stereo_test.mp3 differ diff --git a/test.sh b/test.sh old mode 100644 new mode 100755 index 3413123..1e31ee2 --- a/test.sh +++ b/test.sh @@ -3,8 +3,8 @@ DIR="${BASH_SOURCE%/*}" DESKTOP_PATH=$(xdg-user-dir DESKTOP) -OUT="$DESKTOP_PATH/info.txt" - +OUT="$DESKTOP_PATH/device_info.txt" +source drives.sh if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi @@ -48,6 +48,15 @@ else fi +. "$DIR/speaker.sh" +retval=$? +if [ "$retval" == 0 ] +then + echo -e "Speaker:\t Ja" >>"$OUT" +else + echo -e "Speaker:\t Nein" >>"$OUT" +fi + . "$DIR/wifi.sh" retval=$? if [ "$retval" == 0 ] ; then @@ -67,6 +76,11 @@ else fi #clear + + + +drives $OUT + cat "$OUT" echo "Fertig."